Visual Studio fixes for new code base changes