Fix up windows bootstrap