Tweaks to files for Windows build.