Updates to improve windows build experience.
Fix.