Fixing weird Visual Studio issues with windows, round 2