final fixes for windows build script to make it work