diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index 303857557b2..9f836ae2320 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -1134,7 +1134,7 @@ static MACHINE_CONFIG_DERIVED_CLASS(chihiro_base, xbox_base, chihiro_state)
 MACHINE_CONFIG_END
 
 static MACHINE_CONFIG_DERIVED(chihirogd, chihiro_base)
-	MCFG_NAOMI_GDROM_BOARD_ADD("rom_board", "gdrom", "pic", nullptr, NOOP)
+	MCFG_NAOMI_GDROM_BOARD_ADD("rom_board", "gdrom", "^pic", nullptr, NOOP)
 MACHINE_CONFIG_END
 
 #define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \
diff --git a/src/mame/machine/naomigd.cpp b/src/mame/machine/naomigd.cpp
index 28dc2ccb3e6..0362448e1ce 100644
--- a/src/mame/machine/naomigd.cpp
+++ b/src/mame/machine/naomigd.cpp
@@ -397,7 +397,8 @@ void naomi_gdrom_board::device_start()
 	UINT64 key;
 	UINT8 netpic = 0;
 
-	const UINT8 *picdata = memregion(pic_tag)->base();
+	memory_region *mr = memregion(pic_tag);
+	const UINT8 *picdata = mr->base();
 
 	if(picdata) {
 		if(memregion(pic_tag)->bytes() >= 0x4000) {
diff --git a/src/mame/video/chihiro.cpp b/src/mame/video/chihiro.cpp
index e581ebf852e..f34d5a469ea 100644
--- a/src/mame/video/chihiro.cpp
+++ b/src/mame/video/chihiro.cpp
@@ -3024,6 +3024,8 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN
 				wait();
 			}
 		}
+		else if (primitive_type == NV2A_BEGIN_END::LINE_LOOP) {
+		}
 		else {
 			machine().logerror("Unsupported primitive %d for method 0x1818\n", int(primitive_type));
 			countlen = 0;