fixes for windows for the fixes for the build on mac