diff --git a/ClassicalSharp.sln b/ClassicalSharp.sln
index 85dcae744..18e7d9799 100644
--- a/ClassicalSharp.sln
+++ b/ClassicalSharp.sln
@@ -8,6 +8,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher\Launch
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "OpenTK\OpenTK.csproj", "{35FEE071-2DE6-48A1-9343-B5C1F202A12B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropPatcher", "InteropPatcher\InteropPatcher.csproj", "{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,17 +38,23 @@ Global
 		{BEB1C785-5CAD-48FF-A886-876BF0A318D4}.Debug_DX32|Any CPU.Build.0 = Debug|Any CPU
 		{BEB1C785-5CAD-48FF-A886-876BF0A318D4}.Debug_DX|Any CPU.Build.0 = Debug_DX|Any CPU
 		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug_DX32|Any CPU.Build.0 = Debug|Any CPU
 		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug_DX|Any CPU.Build.0 = Release|Any CPU
 		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug_DX|Any CPU.Build.0 = Release|Any CPU
-		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug_DX|Any CPU.ActiveCfg = Release|Any CPU
+		{35FEE071-2DE6-48A1-9343-B5C1F202A12B}.Debug_DX|Any CPU.ActiveCfg = Debug|Any CPU
 		{23B9BDA8-4330-46AB-9012-08D87430391A}.Debug_DX|Any CPU.Build.0 = Debug|Any CPU
 		{23B9BDA8-4330-46AB-9012-08D87430391A}.Debug_DX|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEB1C785-5CAD-48FF-A886-876BF0A318D4}.Debug_DX|Any CPU.Build.0 = Debug_DX|Any CPU
 		{BEB1C785-5CAD-48FF-A886-876BF0A318D4}.Debug_DX|Any CPU.ActiveCfg = Debug_DX|Any CPU
+		{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Debug_DX|Any CPU.Build.0 = Debug|Any CPU
+		{4A4110EE-21CA-4715-AF67-0C8B7CE0642F}.Debug_DX|Any CPU.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/InteropPatcher/Program.cs b/InteropPatcher/Program.cs
index 24a1c612c..0177bea7b 100644
--- a/InteropPatcher/Program.cs
+++ b/InteropPatcher/Program.cs
@@ -6,11 +6,14 @@ namespace InteropPatcher {
 
 		public static int Main( string[] args ) {
 			try {
-				if( args.Length != 1 ) {
+				if( args.Length == 0 ) {
 					Console.WriteLine( "Expecting single argument specifying the file to patch" );
-					return 1;
+					return 2;
 				}
-				Patcher.PatchFile( args[0] );
+				// Some older IDEs seem to like splitting the path when it has spaces.
+				// So we undo this and treat the arguments as a single path.
+				string path = String.Join( " ", args );
+				Patcher.PatchFile( path );
 				return 0;
 			} catch( Exception ex ) {
 				Console.WriteLine( ex );
diff --git a/OpenTK/OpenTK.csproj b/OpenTK/OpenTK.csproj
index aef32baaa..74b4cf976 100644
--- a/OpenTK/OpenTK.csproj
+++ b/OpenTK/OpenTK.csproj
@@ -28,8 +28,8 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' or '$(Configuration)' == 'Debug_DX'">
     <OutputPath>..\output\debug\</OutputPath>
     <DebugSymbols>True</DebugSymbols>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
@@ -42,6 +42,7 @@
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <DefineConstants>TRACE</DefineConstants>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+    <StartAction>Project</StartAction>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/OpenTK/Platform/MacOS/MacOSException.cs b/OpenTK/Platform/MacOS/MacOSException.cs
index fe64f67f5..01671f837 100644
--- a/OpenTK/Platform/MacOS/MacOSException.cs
+++ b/OpenTK/Platform/MacOS/MacOSException.cs
@@ -90,7 +90,5 @@ namespace OpenTK.Platform.MacOS
 		EventNotInQueue = -9877,
 		HotKeyExists = -9878,
 		EventPassToNextTarget = -9880
-
 	}
-
 }