diff --git a/hash/chessking_cart.xml b/hash/chessking_cart.xml
index 7fe42cdf2e6..66012857d62 100644
--- a/hash/chessking_cart.xml
+++ b/hash/chessking_cart.xml
@@ -5,7 +5,7 @@ license:CC0-1.0
 -->
 <softwarelist name="chessking_cart" description="Chess King cartridges">
 
-	<software name="chn_dic">
+	<software name="dctionry">
 		<description>Yīnghàn Zìdiǎn Dictionary</description>
 		<year>1994</year>
 		<publisher>I-Star Co., Ltd.</publisher>
diff --git a/hash/sgi_mips.xml b/hash/sgi_mips.xml
index e5d10822239..5efe3cc3b14 100644
--- a/hash/sgi_mips.xml
+++ b/hash/sgi_mips.xml
@@ -1444,7 +1444,8 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="onyx2demo1">
+	<!-- requires Onyx2 -->
+	<software name="onyx2demo1" supported="no">
 		<description>Onyx2 - As Real As it Gets Demo CD - Volume 1</description>
 		<year>1998</year> <!-- 09/98 -->
 		<publisher>Silicon Graphics</publisher>
@@ -1457,7 +1458,8 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="onyx2demo2">
+	<!-- requires Onyx2 -->
+	<software name="onyx2demo2" supported="no">
 		<description>Onyx2 - As Real As it Gets Demo CD - Volume 2</description>
 		<year>1998</year> <!-- 09/98 -->
 		<publisher>Silicon Graphics</publisher>
@@ -1470,7 +1472,8 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<software name="onyx2demo3">
+	<!-- requires Onyx2 -->
+	<software name="onyx2demo3" supported="no">
 		<description>Onyx2 - As Real As it Gets Demo CD - Volume 3</description>
 		<year>1998</year> <!-- 09/98 -->
 		<publisher>Silicon Graphics</publisher>
diff --git a/src/mame/toaplan/toaplan2.h b/src/mame/toaplan/toaplan2.h
index faca77bcff2..f3b724242f9 100644
--- a/src/mame/toaplan/toaplan2.h
+++ b/src/mame/toaplan/toaplan2.h
@@ -170,8 +170,9 @@ public:
 		, m_tx_gfxram(*this, "tx_gfxram")
 		, m_dma_space(*this, "dma_space")
 		, m_audiobank(*this, "audiobank")
-		, m_raizing_okibank{{*this, "raizing_okibank0_%u", 0U},
-							{*this, "raizing_okibank1_%u", 0U}}
+		, m_raizing_okibank{
+			{ *this, "raizing_okibank0_%u", 0U },
+			{ *this, "raizing_okibank1_%u", 0U } }
 		, m_eepromout(*this, "EEPROMOUT")
 	{ }
 
@@ -197,9 +198,9 @@ protected:
 
 private:
 	required_shared_ptr<u16> m_tx_videoram;
-	required_shared_ptr<u16> m_tx_lineselect;
-	required_shared_ptr<u16> m_tx_linescroll;
-	required_shared_ptr<u16> m_tx_gfxram;
+	optional_shared_ptr<u16> m_tx_lineselect;
+	optional_shared_ptr<u16> m_tx_linescroll;
+	optional_shared_ptr<u16> m_tx_gfxram;
 
 	optional_device<address_map_bank_device> m_dma_space;