more Visual Studio compatibility fixes