Changes for Visual Studio compatibility