More Visual Studio fixes & cleanup