diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index 846d068e69..46ba6f42d6 100644
--- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -88,7 +88,7 @@ namespace BizHawk.Client.EmuHawk
 			return new AnalogBindPanel(settings, buttons) { Dock = DockStyle.Fill, AutoScroll = true };
 		}
 
-		private static Regex ButtonMatchesPlayer = new Regex("^P(\\d+)\\s");
+		private static readonly Regex ButtonMatchesPlayer = new Regex("^P(\\d+)\\s");
 
 		private void LoadToPanel<T>(Control dest, string controllerName, IList<string> controllerButtons, Dictionary<string,string> categoryLabels, IDictionary<string, Dictionary<string, T>> settingsBlock, T defaultValue, PanelCreator<T> createPanel)
 		{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
index 9a030f0834..5ee71a7eab 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
@@ -19,14 +19,14 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX
 	{
 		[CoreConstructor("PCFX")]
 		public Tst(CoreComm comm, NymaSettings settings, NymaSyncSettings syncSettings)
-			: base(comm, "PCFX", "PCFX Controller Deck", settings, syncSettings)
+			: base(comm, "PCFX", "PC-FX Controller", settings, syncSettings)
 		{
 			throw new InvalidOperationException("To load a PC-FX game, please load the CUE file and not the BIN file.");
 		}
 
 		public Tst(CoreComm comm, GameInfo game,
 			IEnumerable<Disc> disks, NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
-			: base(comm, "PCFX", "PCFX Controller Deck", settings, syncSettings)
+			: base(comm, "PCFX", "PC-FX Controller", settings, syncSettings)
 		{
 			var firmwares = new Dictionary<string, (string, string)>
 			{