diff --git a/src/emucore/CartCM.cxx b/src/emucore/CartCM.cxx
index 52c8e84d7..2e078cccf 100644
--- a/src/emucore/CartCM.cxx
+++ b/src/emucore/CartCM.cxx
@@ -79,9 +79,14 @@ bool CartridgeCM::poke(uInt16 address, uInt8 value)
     {
       mySWCHA = value;
       bank(mySWCHA & 0x3);
-      uInt8& column = myCompuMate->myColumn;
-      if(value & 0x20) column = 0;
-      if(value & 0x40) column = (column + 1) % 10;
+      if(myCompuMate)
+      {
+        uInt8& column = myCompuMate->myColumn;
+        if(value & 0x20)
+          column = 0;
+        if(value & 0x40)
+          column = (column + 1) % 10;
+      }
     }
     mySystem->m6532().poke(address, value);
   }
diff --git a/src/emucore/CartCM.hxx b/src/emucore/CartCM.hxx
index 713ff5b35..189d106eb 100644
--- a/src/emucore/CartCM.hxx
+++ b/src/emucore/CartCM.hxx
@@ -225,7 +225,7 @@ class CartridgeCM : public Cartridge
     /**
       Inform the cartridge about the parent CompuMate controller
     */
-    void setCompuMate(shared_ptr<CompuMate> cmate) { myCompuMate = cmate; }
+    void setCompuMate(shared_ptr<CompuMate>& cmate) { myCompuMate = cmate; }
 
     /**
       Get the current keyboard column
diff --git a/src/emucore/DefProps.hxx b/src/emucore/DefProps.hxx
index dc0262088..900b02932 100644
--- a/src/emucore/DefProps.hxx
+++ b/src/emucore/DefProps.hxx
@@ -2366,7 +2366,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
   { "b9336ed6d94a5cc81a16483b0a946a73", "Atari, Jerome Domurat, Michael Sierchio", "CX2667, CX2667P", "RealSports Soccer (1983) (Atari) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "b958d5fd9574c5cf9ece4b9421c28ecd", "Piero Cavina", "", "Multi-Sprite Game V1.0 (Piero Cavina) (PD)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "b95a6274ca0e0c773bfdc06b4c3daa42", "Paul Slocum", "", "3-D Corridor (29-03-2003) (Paul Slocum)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
-  { "b98cc2c6f7a0f05176f74f0f62c45488", "Spectravideo", "SV-010", "CompuMate (1983) (Spectravideo)", "", "", "", "CM", "", "", "", "", "COMPUMATE", "COMPUMATE", "", "", "NTSC", "", "", "YES", "" }, 
+  { "b98cc2c6f7a0f05176f74f0f62c45488", "Spectravideo", "SV-010", "CompuMate (1983) (Spectravideo)", "", "", "", "CM", "", "", "", "", "COMPUMATE", "COMPUMATE", "", "", "", "", "", "YES", "" }, 
   { "b9b4612358a0b2c1b4d66bb146767306", "Commavid, Ben Burch", "CM-010", "Rush Hour (1983) (Commavid) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "20", "230", "", "" }, 
   { "b9d1e3be30b131324482345959aed5e5", "Activision, Rex Bradford", "", "Kabobber (07-25-1983) (Activision) (Prototype)", "", "Prototype", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "b9f6fa399b8cd386c235983ec45e4355", "Parker Brothers, John Emerson", "931511", "Action Force (1983) (Parker Bros) (PAL)", "AKA G.I. Joe - Cobra Strike", "", "", "", "", "", "", "", "PADDLES", "", "", "01 55", "", "", "", "", "" }, 
@@ -2981,7 +2981,7 @@ static const char* DefProps[DEF_PROPS_SIZE][21] = {
   { "e7864caaf9ec49ed67b1904ce8602690", "", "", "Donkey Kong 2K3 Pic (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "e7a758bb0b43d0f7004e92b9abf4bc83", "", "", "Troll's Adventure (Hack)", "Hack of Adventure", "Hack", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "e7dd8c2e6c100044002c1086d02b366e", "Activision, Steve Cartwright - Ariola", "EAX-013, PAX-013, 711 013-720", "Barnstorming (1982) (Activision) (PAL)", "AKA Die tollkeuhnen Flieger", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
-  { "e7f005ddb6902c648de098511f6ae2e5", "Spectravideo - Universum", "SV-010", "CompuMate (1983) (Spectravideo) (PAL)", "", "", "", "CM", "", "", "", "", "COMPUMATE", "COMPUMATE", "", "", "PAL", "", "", "YES", "" }, 
+  { "e7f005ddb6902c648de098511f6ae2e5", "Spectravideo - Universum", "SV-010", "CompuMate (1983) (Spectravideo) (PAL)", "", "", "", "CM", "", "", "", "", "COMPUMATE", "COMPUMATE", "", "", "", "", "", "YES", "" }, 
   { "e800e4aec7c6c54c9cf3db0d1d030058", "", "", "Qb (2.06) (Retroactive) (Stella)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, 
   { "e80a4026d29777c3c7993fbfaee8920f", "", "", "Frisco (Unknown)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, 
   { "e823b13751e4388f1f2a375d3560a8d7", "Arcadia Corporation, Stephen Harland Landrum", "AR-4105", "Official Frogger (Preview) (1983) (Arcadia) [a]", "", "", "", "", "", "", "", "", "", "", "", "", "", "32", "", "", "" }, 
diff --git a/src/emucore/stella.pro b/src/emucore/stella.pro
index 3251f8430..b002e6561 100644
--- a/src/emucore/stella.pro
+++ b/src/emucore/stella.pro
@@ -14162,6 +14162,13 @@
 "Cartridge.Note" "AKA Grand Prix"
 ""
 
+"Cartridge.MD5" "b50ae55aac93fbed258bc5a873edd2cb"
+"Cartridge.Manufacturer" "Recompile"
+"Cartridge.Name" "E.T. The Extra-Terrestrial (Recompile) (Hack)"
+"Cartridge.Note" "www.neocomputer.org/projects/et"
+"Cartridge.Rarity" "Hack"
+""
+
 "Cartridge.MD5" "b5110f55ed99d5279f18266d001a8cd5"
 "Cartridge.Manufacturer" "Eckhard Stolberg"
 "Cartridge.Name" "Auto-mobile Demo (2001) (Eckhard Stolberg)"
@@ -14452,7 +14459,6 @@
 "Cartridge.Type" "CM"
 "Controller.Left" "COMPUMATE"
 "Controller.Right" "COMPUMATE"
-"Display.Format" "NTSC"
 "Display.Phosphor" "YES"
 ""
 
@@ -18250,7 +18256,6 @@
 "Cartridge.Type" "CM"
 "Controller.Left" "COMPUMATE"
 "Controller.Right" "COMPUMATE"
-"Display.Format" "PAL"
 "Display.Phosphor" "YES"
 ""
 
@@ -20309,10 +20314,3 @@
 "Display.YStart" "28"
 ""
 
-"Cartridge.MD5" "b50ae55aac93fbed258bc5a873edd2cb"
-"Cartridge.Manufacturer" "Recompile"
-"Cartridge.Name" "E.T. The Extra-Terrestrial (Recompile) (Hack)"
-"Cartridge.Note" "www.neocomputer.org/projects/et"
-"Cartridge.Rarity" "Hack"
-""
-