diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 0392828781..79ea19efeb 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -420,7 +420,9 @@
     <Compile Include="SNESTools\SNESOptions.Designer.cs">
       <DependentUpon>SNESOptions.cs</DependentUpon>
     </Compile>
-    <Compile Include="tools\AnalogControlPanel.cs" />
+    <Compile Include="tools\AnalogControlPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="tools\HexColor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -511,7 +513,9 @@
     <Compile Include="tools\VirtualPadGen3Button.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="tools\VirtualPadN64.cs" />
+    <Compile Include="tools\VirtualPadN64.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="tools\VirtualPadN64.Designer.cs">
       <DependentUpon>VirtualPadN64.cs</DependentUpon>
     </Compile>
diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs
index feef43f1dc..69d9a127c2 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.MultiClient/movie/InputAdapters.cs
@@ -585,6 +585,10 @@ namespace BizHawk.MultiClient
 			{
 				return GetDualGameBoyControllerAsMnemonic();				
 			}
+			else if (ControlType == "Nintento 64 Controller")
+			{
+				return ""; // TODO
+			}
 
 			StringBuilder input = new StringBuilder("|");
 
@@ -1017,6 +1021,11 @@ namespace BizHawk.MultiClient
 				SetDualGameBoyControllerAsMnemonic(mnemonic);
 				return;
 			}
+			else if (ControlType == "Nintento 64 Controller")
+			{
+				// TODO
+				return;
+			}
 
 			MnemonicChecker c = new MnemonicChecker(mnemonic);