Visual Studio related fixes