Improved windows build.