diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
index 7f7e42c202..d59a0735f9 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
@@ -166,7 +166,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				byte old_value = value;
 				value &= ReadPRG(addr);
 				//Debug.Assert(old_value == value, "Found a test case of bus conflict. please report.");
-				//report: pinball quest (J)
+				//report: pinball quest (J). also: double dare
 				return value;
 			}
 
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index a096e8ab19..58a04562aa 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -763,8 +763,8 @@ namespace BizHawk.MultiClient
 				snesControls.BindMulti("P" + (i + 1) + " Y", Global.Config.SNESController[i].Y);
 				snesControls.BindMulti("P" + (i + 1) + " L", Global.Config.SNESController[i].L);
 				snesControls.BindMulti("P" + (i + 1) + " R", Global.Config.SNESController[i].R);
-				snesControls.BindMulti("P" + (i + 1) + " Select", Global.Config.NESController[i].Select);
-				snesControls.BindMulti("P" + (i + 1) + " Start", Global.Config.NESController[i].Start);
+				snesControls.BindMulti("P" + (i + 1) + " Select", Global.Config.SNESController[i].Select);
+				snesControls.BindMulti("P" + (i + 1) + " Start", Global.Config.SNESController[i].Start);
 			}
 			Global.SNESControls = snesControls;