Visual Studio Solution fixes