diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp
index a1775155bd5..61a28c5c54e 100644
--- a/src/mame/drivers/gaelco3d.cpp
+++ b/src/mame/drivers/gaelco3d.cpp
@@ -950,13 +950,13 @@ MACHINE_CONFIG_START(gaelco3d_state::gaelco3d)
 
 	LS259(config, m_mainlatch); // IC5 on bottom board next to EEPROM
 	m_mainlatch->q_out_cb<0>().set(m_serial, FUNC(gaelco_serial_device::tr_w));
-	m_mainlatch->q_out_cb<0>().set(m_serial, FUNC(gaelco_serial_device::rts_w));
-	m_mainlatch->q_out_cb<0>().set(m_eeprom, FUNC(eeprom_serial_93cxx_device::di_write));
-	m_mainlatch->q_out_cb<0>().set(m_eeprom, FUNC(eeprom_serial_93cxx_device::clk_write));
-	m_mainlatch->q_out_cb<0>().set(m_eeprom, FUNC(eeprom_serial_93cxx_device::cs_write));
-	m_mainlatch->q_out_cb<0>().set(FUNC(gaelco3d_state::tms_reset_w));
-	m_mainlatch->q_out_cb<0>().set(FUNC(gaelco3d_state::tms_irq_w));
-	m_mainlatch->q_out_cb<0>().set(FUNC(gaelco3d_state::unknown_13a_w));
+	m_mainlatch->q_out_cb<1>().set(m_serial, FUNC(gaelco_serial_device::rts_w));
+	m_mainlatch->q_out_cb<2>().set(m_eeprom, FUNC(eeprom_serial_93cxx_device::di_write));
+	m_mainlatch->q_out_cb<3>().set(m_eeprom, FUNC(eeprom_serial_93cxx_device::clk_write));
+	m_mainlatch->q_out_cb<4>().set(m_eeprom, FUNC(eeprom_serial_93cxx_device::cs_write));
+	m_mainlatch->q_out_cb<5>().set(FUNC(gaelco3d_state::tms_reset_w));
+	m_mainlatch->q_out_cb<6>().set(FUNC(gaelco3d_state::tms_irq_w));
+	m_mainlatch->q_out_cb<7>().set(FUNC(gaelco3d_state::unknown_13a_w));
 
 	LS259(config, m_outlatch); // IC2 on top board near edge connector
 	m_outlatch->q_out_cb<1>().set(FUNC(gaelco3d_state::tms_control3_w));
diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp
index 316663cae70..3e77fcc367f 100644
--- a/src/mame/drivers/slapfght.cpp
+++ b/src/mame/drivers/slapfght.cpp
@@ -1019,9 +1019,9 @@ MACHINE_CONFIG_START(slapfght_state::slapfigh)
 	MCFG_DEVICE_IO_MAP(io_map_mcu)
 
 	ls259_device &mainlatch(LS259(config, "mainlatch"));
-	mainlatch.q_out_cb<0>().set(FUNC(slapfght_state::slapfght_state::sound_reset_w));
-	mainlatch.q_out_cb<1>().set(FUNC(slapfght_state::slapfght_state::flipscreen_w));
-	mainlatch.q_out_cb<3>().set(FUNC(slapfght_state::slapfght_state::irq_enable_w));
+	mainlatch.q_out_cb<0>().set(FUNC(slapfght_state::sound_reset_w));
+	mainlatch.q_out_cb<1>().set(FUNC(slapfght_state::flipscreen_w));
+	mainlatch.q_out_cb<3>().set(FUNC(slapfght_state::irq_enable_w));
 	mainlatch.q_out_cb<4>().set_membank("bank1");
 
 	MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(36'000'000)/12) // 3MHz