Harmonize WIN32, and update bootstrap