diff --git a/hash/pc98_cd.xml b/hash/pc98_cd.xml
index 018302b46ee..2a7aff03afa 100644
--- a/hash/pc98_cd.xml
+++ b/hash/pc98_cd.xml
@@ -4279,7 +4279,7 @@ license:CC0
 
 	<!-- PC-9821 / DOS/V hybrid -->
 	<!-- Severe graphics glitches -->
-	<software name="momagic">
+	<software name="momagic" supported="no">
 		<!--
 		Origin: redump.org
 		<rom name="Master of Magic (Japan).bin" size="62038704" crc="8069be95" sha1="91fb29b26466ce32e4229f813666700aa5af2915"/>
diff --git a/src/frontend/mame/ui/ui.h b/src/frontend/mame/ui/ui.h
index cec1ed67cfe..e773e669cd6 100644
--- a/src/frontend/mame/ui/ui.h
+++ b/src/frontend/mame/ui/ui.h
@@ -24,11 +24,11 @@
 #include <any>
 #include <cassert>
 #include <ctime>
-#include <map>
 #include <set>
 #include <string_view>
 #include <typeindex>
 #include <typeinfo>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
@@ -229,7 +229,7 @@ public:
 private:
 	using handler_callback_func = delegate<uint32_t (render_container &)>;
 	using device_feature_set = std::set<std::pair<std::string, std::string> >;
-	using session_data_map = std::map<std::type_index, std::any>;
+	using session_data_map = std::unordered_map<std::type_index, std::any>;
 
 	// instance variables
 	std::unique_ptr<render_font> m_font;
diff --git a/src/mame/machine/cps2comm.cpp b/src/mame/machine/cps2comm.cpp
index a7fe8f2ac65..95701ef264d 100644
--- a/src/mame/machine/cps2comm.cpp
+++ b/src/mame/machine/cps2comm.cpp
@@ -638,8 +638,8 @@ void cps2_comm_device::usart_control_w(offs_t offset, u16 data, u16 mem_mask)
 				LOG("%s: USART mode = 0x%02X: Synchronous, %d-bit, %s Parity, %s Sync Detect, %d Sync Characters\n",
 						machine().describe_context(),
 						m_usart_mode,
-						std::array{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)],
-						std::array{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)],
+						std::array<int, 4>{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)],
+						std::array<char const *, 4>{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)],
 						BIT(m_usart_mode, 6) ? "External" : "Internal",
 						BIT(m_usart_mode, 7) ? 1 : 2);
 				m_usart_control_phase = CTRL_SYNC1;
@@ -649,10 +649,10 @@ void cps2_comm_device::usart_control_w(offs_t offset, u16 data, u16 mem_mask)
 				LOG("%s: USART mode = 0x%02X: Asynchronous, x %d Clock, %d-bit, %s Parity, %s Transmit Stop Bits\n",
 						machine().describe_context(),
 						m_usart_mode,
-						std::array{ -1, 1, 16, 64 }[BIT(m_usart_mode, 0, 2)],
-						std::array{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)],
-						std::array{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)],
-						std::array{ "Illegal", "1", "1-1/2", "2" }[BIT(m_usart_mode, 6, 2)]);
+						std::array<int, 4>{ -1, 1, 16, 64 }[BIT(m_usart_mode, 0, 2)],
+						std::array<int, 4>{ 5, 6, 7, 8 }[BIT(m_usart_mode, 2, 2)],
+						std::array<char const *, 4>{ "No", "Odd", "No", "Even" }[BIT(m_usart_mode, 4, 2)],
+						std::array<char const *, 4>{ "Illegal", "1", "1-1/2", "2" }[BIT(m_usart_mode, 6, 2)]);
 				m_usart_control_phase = CTRL_COMMAND;
 				m_usart_status |= 0x01U;
 			}
@@ -715,9 +715,9 @@ void cps2_comm_device::route_w(offs_t offset, u16 data, u16 mem_mask)
 				machine().describe_context(),
 				m_route,
 				BIT(m_route, 4) ? "low" : "high",
-				std::array{ "1", "TxD & OUT", "1",   "TxD" }[BIT(m_route, 0, 2)],
-				std::array{ "1", "IN",        "TxD", "1"   }[BIT(m_route, 0, 2)],
-				std::array{ "1", "IN",        "OUT", "IN"  }[BIT(m_route, 0, 2)]);
+				std::array<char const *, 4>{ "1", "TxD & OUT", "1",   "TxD" }[BIT(m_route, 0, 2)],
+				std::array<char const *, 4>{ "1", "IN",        "TxD", "1"   }[BIT(m_route, 0, 2)],
+				std::array<char const *, 4>{ "1", "IN",        "OUT", "IN"  }[BIT(m_route, 0, 2)]);
 	}
 }