diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
index a0a0c08d44..5d6e7c784c 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs
@@ -33,6 +33,9 @@ namespace BizHawk.Client.EmuHawk
 					case LibGPGX.INPUT_DEVICE.DEVICE_MOUSE:
 						yield return Mouse(player);
 						break;
+					case LibGPGX.INPUT_DEVICE.DEVICE_XE_A1P:
+						// TO DO
+						break;
 				}
 
 				player++;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
index 9855372a7c..9c3073f815 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
@@ -556,24 +556,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 				{
 					ControllerDefinition.BoolButtons.AddRange(new []
 					{
-						"P" + (i + 1) + "A Up",
-						"P" + (i + 1) + "A Down",
-						"P" + (i + 1) + "A Left",
-						"P" + (i + 1) + "A Right",
-						"P" + (i + 1) + "DPad U",
-						"P" + (i + 1) + "DPad D",
-						"P" + (i + 1) + "DPad L",
-						"P" + (i + 1) + "DPad R",
-						"P" + (i + 1) + "Start",
-						"P" + (i + 1) + "Z",
-						"P" + (i + 1) + "B",
-						"P" + (i + 1) + "A",
-						"P" + (i + 1) + "C Up",
-						"P" + (i + 1) + "C Down",
-						"P" + (i + 1) + "C Right",
-						"P" + (i + 1) + "C Left",
-						"P" + (i + 1) + "L",
-						"P" + (i + 1) + "R", 
+						"P" + (i + 1) + " A Up",
+						"P" + (i + 1) + " A Down",
+						"P" + (i + 1) + " A Left",
+						"P" + (i + 1) + " A Right",
+						"P" + (i + 1) + " DPad U",
+						"P" + (i + 1) + " DPad D",
+						"P" + (i + 1) + " DPad L",
+						"P" + (i + 1) + " DPad R",
+						"P" + (i + 1) + " Start",
+						"P" + (i + 1) + " Z",
+						"P" + (i + 1) + " B",
+						"P" + (i + 1) + " A",
+						"P" + (i + 1) + " C Up",
+						"P" + (i + 1) + " C Down",
+						"P" + (i + 1) + " C Right",
+						"P" + (i + 1) + " C Left",
+						"P" + (i + 1) + " L",
+						"P" + (i + 1) + " R", 
 					});
 
 					ControllerDefinition.FloatControls.AddRange(new[]