diff --git a/hash/gba.xml b/hash/gba.xml
index ee309b45a3b..bad7a034331 100644
--- a/hash/gba.xml
+++ b/hash/gba.xml
@@ -279,7 +279,7 @@ Note: In the AGB-E05-XX and AGB-E06-XX pcbs, the chip name is hidden under the b
 			<feature name="pcb" value="AGB-E01-41" />
 			<feature name="u1" value="U1 GPIO MASKROM" />
 
-			<feature name="pcb_type" value="GBA-EEPROM-4K" /><!-- no eeprom on pcb, uses passwords, check this -->
+			<!-- there is no eeprom on pcb (game uses passwords), but internal header has GBA-EEPROM-4K  -->
 			<dataarea name="rom" size="4194304">
 				<rom name="agb-b3jp-0 h2.u1" size="4194304" crc="eef104b0" sha1="702b89df39afae4d767977ae5b5ed0467e009ffc" offset="000000" />
 			</dataarea>
@@ -10325,8 +10325,7 @@ Note: In the AGB-E05-XX and AGB-E06-XX pcbs, the chip name is hidden under the b
 		<publisher>Namco</publisher>
 		<info name="serial" value="AGB-B3JE-USA"/>
 		<part name="cart" interface="gba_cart">
-			<feature name="slot" value="gba_eeprom_4k" />
-			<feature name="pcb_type" value="GBA-EEPROM-4K" />
+			<!-- internal header has GBA-EEPROM-4K, but the Euro cart has no eeprom in the PCB so we treat this as base cart  -->
 			<dataarea name="rom" size="4194304">
 				<rom name="curious george (usa).bin" size="4194304" crc="f6b549dd" sha1="7153a1e2b246c1997a91257480c67ac8b54fe61b" offset="000000" />
 			</dataarea>
@@ -37899,14 +37898,12 @@ The cart also contained a non-empty SRAM save which we currently include in the
 		</part>
 	</software>
 
-	<software name="topguncz" supported="no">
+	<software name="topguncz">
 		<description>Top Gun - Combat Zones (USA)</description>
 		<year>2004</year>
 		<publisher>Mastiff</publisher>
 		<info name="serial" value="AGB-A2YE-USA"/>
 		<part name="cart" interface="gba_cart">
-			<feature name="slot" value="gba_sram" />
-			<feature name="pcb_type" value="GBA-SRAM" />
 			<dataarea name="rom" size="4194304">
 				<rom name="top gun - combat zones (usa) (en,fr,de,es,it).bin" size="4194304" crc="dfc88d3e" sha1="4f6ae177d236657a075e3366ed4f90c97b03f10d" offset="000000" />
 			</dataarea>
diff --git a/src/emu/bus/gba/gba_slot.h b/src/emu/bus/gba/gba_slot.h
index a3638c63b14..0be99cd77ec 100644
--- a/src/emu/bus/gba/gba_slot.h
+++ b/src/emu/bus/gba/gba_slot.h
@@ -174,7 +174,7 @@ static const gba_chip_fix_conflict_item gba_chip_fix_conflict_list[] =
 	{ "BR4J", GBA_CHIP_FLASH      }, // 1586 - Rockman EXE 4.5 - Real Operation (JPN)
 	{ "BG8J", GBA_CHIP_EEPROM_64K }, // 1853 - Ganbare! Dodge Fighters (JPN)
 	{ "AROP", GBA_CHIP_EEPROM_4K  }, // 1862 - Rocky (EUR)
-	{ "A2YE", GBA_CHIP_SRAM       }, // 1906 - Top Gun - Combat Zones (USA)
+//	"A2YE" - 1906 - Top Gun - Combat Zones (USA) - multiple NVRAM chips detected, but none present (protection against emu?)
 	{ "BKMJ", GBA_CHIP_EEPROM_4K  }, // 2039 - Kim Possible (JPN)
 	{ "BKEJ", GBA_CHIP_EEPROM_64K }, // 2047 - Konjiki no Gashbell - The Card Battle for GBA (JPN)
 	{ "BKMP", GBA_CHIP_EEPROM_4K  }, // 2297 - Kim Possible 2 - Drakken's Demise (EUR)