Merge: Windows: last changes for a working bootstrap