Fixes few bootstrapping issues on Windows