Fixed several files due to really poor merging in Visual Studio