Visual Studio Fixups in progress