More VisualStudio fixes