Updates for new Windows dev environment.