Changes to windows build bootstrap