Windows fixes

Update to get bootstrapping working with windows.