Merge: Windows: fix bootstrap