diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs
index 94f18768bb..8bb39406c0 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/HyperNyma.cs
@@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
 			NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
 			: base(comm, "PCE", "PC Engine Controller", settings, syncSettings)
 		{
-			var firmwares = new Dictionary<string, ValueTuple<string, string>>
+			var firmwares = new Dictionary<string, (string, string)>
 			{
 				{ "FIRMWARE:syscard3.pce", ("PCECD", "Bios") },
 				// { "FIRMWARE:gecard.pce", ("PCECD", "GE-Bios") },
diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
index fdd18ecef1..3fa3684823 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCE/TurboNyma.cs
@@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCE
 			NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
 			: base(comm, "PCE", "PC Engine Controller", settings, syncSettings)
 		{
-			var firmwares = new Dictionary<string, ValueTuple<string, string>>
+			var firmwares = new Dictionary<string, (string, string)>
 			{
 				{ "FIRMWARE:syscard3.pce", ("PCECD", "Bios") },
 				{ "FIRMWARE:gecard.pce", ("PCECD", "GE-Bios") },
diff --git a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
index f8add6ee99..3789ed0b3e 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
@@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX
 			IEnumerable<Disc> disks, NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
 			: base(comm, "PCFX", "PCFX Controller Deck", settings, syncSettings)
 		{
-			var firmwares = new Dictionary<string, ValueTuple<string, string>>
+			var firmwares = new Dictionary<string, (string, string)>
 			{
 				{ "FIRMWARE:pcfx.rom", ("PCFX", "BIOS") },
 			};
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BootGodDB.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BootGodDB.cs
index 253a22c936..065242c1c8 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BootGodDB.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/BootGodDB.cs
@@ -24,7 +24,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 		public static void Initialize(string basePath)
 		{
 			if (acquire != null) throw new InvalidOperationException("Bootgod DB multiply initialized");
-			acquire =  new EventWaitHandle(false, EventResetMode.ManualReset); ;
+			acquire = new EventWaitHandle(false, EventResetMode.ManualReset);
 
 			var stopwatch = Stopwatch.StartNew();
 			ThreadPool.QueueUserWorkItem(_ =>
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs
index 86abcf7c65..dab820a68c 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Saturnus.cs
@@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.Saturn
 			IEnumerable<Disc> disks, NymaSettings settings, NymaSyncSettings syncSettings, bool deterministic)
 			: base(comm, "SAT", "Saturn Controller Deck", settings, syncSettings)
 		{
-			var firmwares = new Dictionary<string, ValueTuple<string, string>>
+			var firmwares = new Dictionary<string, (string, string)>
 			{
 				{ "FIRMWARE:$J", ("SAT", "J") },
 				{ "FIRMWARE:$U", ("SAT", "U") },
diff --git a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs
index ad15cc1b0f..58500a3348 100644
--- a/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs
+++ b/src/BizHawk.Emulation.Cores/Waterbox/NymaCore.cs
@@ -14,7 +14,7 @@ using NymaTypes;
 
 namespace BizHawk.Emulation.Cores.Waterbox
 {
-	public unsafe abstract partial class NymaCore : WaterboxCore
+	public abstract unsafe partial class NymaCore : WaterboxCore
 	{
 		protected NymaCore(CoreComm comm,
 			string systemId, string controllerDeckName,
@@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
 
 		private LibNymaCore _nyma;
 		protected T DoInit<T>(GameInfo game, byte[] rom, Disc[] discs, string wbxFilename, string extension, bool deterministic,
-			IDictionary<string, ValueTuple<string, string>> firmwares = null)
+			IDictionary<string, (string SystemID, string FirmwareID)> firmwares = null)
 			where T : LibNymaCore
 		{
 			var t = PreInit<T>(new WaterboxOptions
@@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Waterbox
 					{
 						if (firmwares.TryGetValue(s, out var tt))
 						{
-							var data = CoreComm.CoreFileProvider.GetFirmware(tt.Item1, tt.Item2, false,
+							var data = CoreComm.CoreFileProvider.GetFirmware(tt.SystemID, tt.FirmwareID, false,
 								"Firmware files are usually required and may stop your game from loading");
 							if (data != null)
 							{