fixes for Visual Studio