diff --git a/src/mame/gameplan/enigma2.cpp b/src/mame/gameplan/enigma2.cpp
index 735ef306a22..fd088260dd9 100644
--- a/src/mame/gameplan/enigma2.cpp
+++ b/src/mame/gameplan/enigma2.cpp
@@ -828,6 +828,6 @@ void enigma2_state::init_enigma2()
 } // Anonymous namespace
 
 
-GAME( 1981, enigma2,  0,       enigma2,  enigma2,  enigma2_state, init_enigma2, ROT270, "Game Plan (Zilec Electronics license)", "Enigma II",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1981, enigma2,  0,       enigma2,  enigma2,  enigma2_state, init_enigma2, ROT270, "Zilec Electronics (Game Plan license)", "Enigma II",                             MACHINE_SUPPORTS_SAVE )
 GAME( 1984, enigma2a, enigma2, enigma2a, enigma2a, enigma2_state, init_enigma2, ROT270, "Zilec Electronics",                     "Enigma II (Space Invaders hardware)",   MACHINE_SUPPORTS_SAVE )
 GAME( 1981, enigma2b, enigma2, enigma2a, enigma2a, enigma2_state, init_enigma2, ROT270, "Zilec Electronics",                     "Phantoms II (Space Invaders hardware)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/namco/namcos23.cpp b/src/mame/namco/namcos23.cpp
index c5312572ca7..d14b5745f1c 100644
--- a/src/mame/namco/namcos23.cpp
+++ b/src/mame/namco/namcos23.cpp
@@ -3496,8 +3496,7 @@ static INPUT_PORTS_START( rapidrvr )
 
 	PORT_MODIFY("ADC1")
 	PORT_BIT( 0x3ff, 0x0200, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_NAME("Pitch")
-
-	INPUT_PORTS_END
+INPUT_PORTS_END
 
 
 static INPUT_PORTS_START( rapidrvrp )
diff --git a/src/mame/yamaha/ymmu5.cpp b/src/mame/yamaha/ymmu5.cpp
index 8e92b18afb7..06b79cbc44b 100644
--- a/src/mame/yamaha/ymmu5.cpp
+++ b/src/mame/yamaha/ymmu5.cpp
@@ -212,13 +212,13 @@ void mu5_state::mu5(machine_config &config)
 	/* basic machine hardware */
 	H83002(config, m_maincpu, 10_MHz_XTAL); // clock verified by schematics
 	m_maincpu->set_addrmap(AS_PROGRAM, &mu5_state::mu5_map);
-	m_maincpu->read_adc<7>().set([]() -> u8 { return 0xff; }); // Battery level
+	m_maincpu->read_adc<7>().set_constant(0x3ff); // battery level
 	m_maincpu->read_port4().set([this]() -> u8 { return m_matrixsel; });
 	m_maincpu->write_port4().set([this](u8 data) { m_matrixsel = data; });
 	m_maincpu->read_port6().set(FUNC(mu5_state::lcd_ctrl_r));
 	m_maincpu->write_port6().set(FUNC(mu5_state::lcd_ctrl_w));
 	m_maincpu->read_port7().set(FUNC(mu5_state::matrix_r));
-	m_maincpu->read_porta().set([]() -> u8 { return 0; });
+	m_maincpu->read_porta().set_constant(0);
 	m_maincpu->read_portb().set(FUNC(mu5_state::lcd_data_r));
 	m_maincpu->write_portb().set(FUNC(mu5_state::lcd_data_w));