More Visual Studio fixes