diff --git a/src/devices/machine/roc10937.h b/src/devices/machine/roc10937.h
index 2dfc434501d..4f67cd975cd 100644
--- a/src/devices/machine/roc10937.h
+++ b/src/devices/machine/roc10937.h
@@ -31,11 +31,11 @@
 		MCFG_DEVICE_REMOVE(_tag)
 
 #define MCFG_MSC1937_ADD(_tag,_val) \
-		MCFG_DEVICE_ADD(_tag, ROC10937,60)\
+		MCFG_DEVICE_ADD(_tag, MSC1937,60)\
 		MCFG_MSC1937_PORT(_val)
 
 #define MCFG_MSC1937_PORT(_val) \
-		MCFG_ROC10937_PORT(_val)
+		downcast<msc1937_device &>(*device).set_port_value(_val);
 
 #define MCFG_MSC1937_REMOVE(_tag) \
 		MCFG_DEVICE_REMOVE(_tag)
@@ -45,7 +45,7 @@
 		MCFG_MIC10937_PORT(_val)
 
 #define MCFG_MIC10937_PORT(_val) \
-		MCFG_ROC10937_PORT(_val)
+		downcast<mic10937_device &>(*device).set_port_value(_val);
 
 #define MCFG_MIC10937_REMOVE(_tag) \
 		MCFG_DEVICE_REMOVE(_tag)
@@ -55,7 +55,7 @@
 		MCFG_S16LF01_PORT(_val)
 
 #define MCFG_S16LF01_PORT(_val) \
-		MCFG_ROC10937_PORT(_val)
+		downcast<s16lf01_device &>(*device).set_port_value(_val);
 
 class rocvfd_device : public device_t
 {
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp
index 915c171cfc8..f123cc281bf 100644
--- a/src/mame/audio/taito_en.cpp
+++ b/src/mame/audio/taito_en.cpp
@@ -224,7 +224,7 @@ MACHINE_CONFIG_START(taito_en_device::device_add_mconfig)
 	MCFG_SOUND_ADD("ensoniq", ES5505, XTAL(30'476'100) / 2)
 	MCFG_ES5505_REGION0("ensoniq.0")
 	MCFG_ES5505_REGION1("ensoniq.0")
-	MCFG_ES5506_CHANNELS(4)
+	MCFG_ES5505_CHANNELS(4)
 	MCFG_SOUND_ROUTE_EX(0, "pump", 1.0, 0)
 	MCFG_SOUND_ROUTE_EX(1, "pump", 1.0, 1)
 	MCFG_SOUND_ROUTE_EX(2, "pump", 1.0, 2)
diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp
index a6333d60108..73db8a2256b 100644
--- a/src/mame/drivers/bfmsys85.cpp
+++ b/src/mame/drivers/bfmsys85.cpp
@@ -126,7 +126,7 @@ public:
 	virtual void machine_reset() override;
 	INTERRUPT_GEN_MEMBER(timer_irq);
 	int b85_find_project_string( );
-	optional_device<roc10937_device> m_vfd;
+	optional_device<rocvfd_device> m_vfd;
 	required_device<cpu_device> m_maincpu;
 	required_device<stepper_device> m_reel0;
 	required_device<stepper_device> m_reel1;
diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp
index 7d0e53acced..ecb5a8ef1dc 100644
--- a/src/mame/drivers/dragon.cpp
+++ b/src/mame/drivers/dragon.cpp
@@ -281,6 +281,7 @@ MACHINE_CONFIG_START(dragon64_state::dragon64h)
 	// Replace M6809 with HD6309
 	MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
 	MCFG_CPU_PROGRAM_MAP(dragon_mem)
+	MCFG_DEVICE_MODIFY(RAM_TAG)
 	MCFG_RAM_DEFAULT_SIZE("64K")
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp
index 1d54a6ead80..c1fb367af6f 100644
--- a/src/mame/drivers/kc.cpp
+++ b/src/mame/drivers/kc.cpp
@@ -158,10 +158,10 @@ MACHINE_CONFIG_START(kc_state::kc85_3)
 	/* expansion interface */
 	MCFG_DEVICE_ADD("exp", KCEXP_SLOT, 0)
 	MCFG_DEVICE_SLOT_INTERFACE(kc85_exp, nullptr, false)
-	MCFG_KCCART_SLOT_NEXT_SLOT(nullptr)
-	MCFG_KCCART_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
-	MCFG_KCCART_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
-	MCFG_KCCART_SLOT_OUT_HALT_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
+	MCFG_KCEXP_SLOT_NEXT_SLOT(nullptr)
+	MCFG_KCEXP_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
+	MCFG_KCEXP_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
+	MCFG_KCEXP_SLOT_OUT_HALT_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
 
 	/* Software lists */
 	MCFG_SOFTWARE_LIST_ADD("cart_list", "kc_cart")
@@ -242,10 +242,10 @@ MACHINE_CONFIG_START(kc85_4_state::kc85_4)
 	/* expansion interface */
 	MCFG_DEVICE_ADD("exp", KCEXP_SLOT, 0)
 	MCFG_DEVICE_SLOT_INTERFACE(kc85_exp, nullptr, false)
-	MCFG_KCCART_SLOT_NEXT_SLOT(nullptr)
-	MCFG_KCCART_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
-	MCFG_KCCART_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
-	MCFG_KCCART_SLOT_OUT_HALT_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
+	MCFG_KCEXP_SLOT_NEXT_SLOT(nullptr)
+	MCFG_KCEXP_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
+	MCFG_KCEXP_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
+	MCFG_KCEXP_SLOT_OUT_HALT_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
 
 	/* Software lists */
 	MCFG_SOFTWARE_LIST_ADD("cart_list", "kc_cart")
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index c021390dfcd..a88f99a2e7e 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -266,7 +266,7 @@ private:
 	required_device<cpu_device> m_maincpu;
 	required_device_array<stepper_device, 4> m_reels;
 	required_device<meters_device> m_meters;
-	optional_device<roc10937_device> m_vfd;
+	optional_device<rocvfd_device> m_vfd;
 	output_finder<8> m_triac;
 	output_finder<8> m_digit;
 	output_finder<8 * 8> m_lamp;
diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp
index f4e2537bc70..805176f4bfb 100644
--- a/src/mame/drivers/nascom1.cpp
+++ b/src/mame/drivers/nascom1.cpp
@@ -670,8 +670,8 @@ MACHINE_CONFIG_START(nascom_state::nascom)
 	MCFG_DEVICE_ADD( "hd6402", AY31015, 0 )
 	MCFG_AY31015_TX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
 	MCFG_AY31015_RX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
-	MCFG_AY51013_READ_SI_CB(READLINE(nascom_state, nascom1_hd6402_si))
-	MCFG_AY51013_WRITE_SO_CB(WRITELINE(nascom_state, nascom1_hd6402_so))
+	MCFG_AY31015_READ_SI_CB(READLINE(nascom_state, nascom1_hd6402_si))
+	MCFG_AY31015_WRITE_SO_CB(WRITELINE(nascom_state, nascom1_hd6402_so))
 
 	// cassette is connected to the uart
 	MCFG_CASSETTE_ADD("cassette")
diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h
index 3089866d181..cd850b643f3 100644
--- a/src/mame/includes/mpu4.h
+++ b/src/mame/includes/mpu4.h
@@ -316,7 +316,7 @@ protected:
 	void mpu4_config_common();
 
 	required_device<cpu_device> m_maincpu;
-	optional_device<roc10937_device> m_vfd;
+	optional_device<rocvfd_device> m_vfd;
 	optional_device<ptm6840_device> m_6840ptm;
 	optional_device<pia6821_device> m_pia3;
 	optional_device<pia6821_device> m_pia4;