Changes for windows build.