diff --git a/hash/pet_cass.xml b/hash/pet_cass.xml
index 62b76d2f8e0..09179d09a33 100644
--- a/hash/pet_cass.xml
+++ b/hash/pet_cass.xml
@@ -2816,7 +2816,7 @@
 
 	<software name="spacei">
 		<description>Space Invaders</description>
-		<year>19xx</year>
+		<year>19??</year>
 		<publisher>Unknown</publisher>
 
 		<!-- pet8032 cb2snd Side A: invaders -->
@@ -2926,7 +2926,7 @@
 
 	<software name="timec">
 		<description>Time Chess</description>
-		<year>198_</year>
+		<year>198?</year>
 
 		<!-- pet8032 Side A: time chess -->
 		<publisher>Unknown</publisher>
diff --git a/hash/pet_flop.xml b/hash/pet_flop.xml
index 6cb9520b28c..54425074044 100644
--- a/hash/pet_flop.xml
+++ b/hash/pet_flop.xml
@@ -26,7 +26,7 @@
 		</part>
 	</software>
 
-	<software name="1001demoa">
+	<software name="1001demoa" cloneof="1001demo">
 		<description>Commodore SFD-1001 Test/Demo</description>
 		<year>198?</year>
 		<publisher>Commodore</publisher>
@@ -62,7 +62,7 @@
 		</part>
 	</software>
 
-	<software name="datestond">
+	<software name="dateston">
 		<description>The Datestones of Ryn A Microquest</description>
 		<year>1979</year>
 		<publisher>Automated Simulations</publisher>
@@ -98,7 +98,7 @@
 		</part>
 	</software>
 
-	<software name="hellfired">
+	<software name="hellfire">
 		<description>Hellfire Warrior</description>
 		<year>1980</year>
 		<publisher>Automated Simulations</publisher>
diff --git a/src/mess/drivers/rambo.c b/src/mess/drivers/rambo.c
index 50fa8e41fe2..8dd28468990 100644
--- a/src/mess/drivers/rambo.c
+++ b/src/mess/drivers/rambo.c
@@ -223,5 +223,5 @@ ROM_START( metamaq2 )
     ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
 ROM_END
 
-/*   YEAR  NAME      PARENT    COMPAT    MACHINE   INPUT     INIT                         COMPANY   FULLNAME */
-COMP(2012, metamaq2,      0,    rambo,     rambo,      0,    rambo_state, rambo,    "Metamaquina", "Metamaquina 2 desktop 3d printer", GAME_NOT_WORKING | GAME_NO_SOUND)
+/*   YEAR  NAME      PARENT    COMPAT    MACHINE   INPUT   CLASS        INIT         COMPANY           FULLNAME */
+COMP(2012, metamaq2,      0,        0,   rambo,    0,      rambo_state, rambo,    "Metamaquina", "Metamaquina 2 desktop 3d printer", GAME_NOT_WORKING | GAME_NO_SOUND)