Improvements to windows build