diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
index 8707cab227..dd0fb50bce 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64.Motherboard.cs
@@ -1,6 +1,4 @@
-using System.Reflection;
-
-using BizHawk.Common;
+using BizHawk.Common;
 using BizHawk.Emulation.Common;
 using BizHawk.Emulation.Cores.Computers.Commodore64.Cartridge;
 using BizHawk.Emulation.Cores.Computers.Commodore64.Cassette;
@@ -294,7 +292,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 			ColorRam.SyncState(ser);
 			ser.EndSection();
 
-			ser.BeginSection("Cpu"); SaveState.SyncObject(ser, Cpu); ser.EndSection();
+			ser.BeginSection("Cpu");
+			Cpu.SyncState(ser);
+			ser.EndSection();
+
 			ser.BeginSection("KernalRom"); SaveState.SyncObject(ser, KernalRom); ser.EndSection();
 			ser.BeginSection("Pla"); SaveState.SyncObject(ser, Pla); ser.EndSection();
 			ser.BeginSection("Ram"); SaveState.SyncObject(ser, Ram); ser.EndSection();
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23128.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23128.cs
index a5107f90e5..92f85c7544 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23128.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip23128.cs
@@ -36,5 +36,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 		{
 			return _rom[addr & 0x3FFF];
 		}
+
+		public void SyncState(Serializer ser)
+		{
+			SaveState.SyncObject(ser, this);
+		}
 	}
 }
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
index 77897b403c..7528ab22df 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.cs
@@ -222,7 +222,15 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 
 		public void SyncState(Serializer ser)
 		{
-			SaveState.SyncObject(ser, this);
+			_cpu.SyncState(ser);
+			ser.Sync("_pinNmiLast", ref _pinNmiLast);
+
+			ser.BeginSection("_port");
+			_port.SyncState(ser);
+			ser.EndSection();
+
+			ser.Sync("_thisNmi", ref _thisNmi);
+			ser.Sync("LagCycles", ref LagCycles);
 		}
 
 		public void Write(int addr, int val)
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/LatchedPort.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/LatchedPort.cs
index d4931fe541..6fbc09eb29 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/LatchedPort.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/LatchedPort.cs
@@ -39,7 +39,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 
 		public void SyncState(Serializer ser)
 		{
-			SaveState.SyncObject(ser, this);
+			ser.Sync("Direction", ref Direction);
+			ser.Sync("Latch", ref Latch);
 		}
 	}
 
@@ -79,7 +80,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 
 		public void SyncState(Serializer ser)
 		{
-			SaveState.SyncObject(ser, this);
+			ser.Sync("Direction", ref Direction);
+			ser.Sync("Latch", ref Latch);
 		}
 	}
 }