visual studio fixups