More fixes for windows build script