diff --git a/src/mess/machine/s100_dj2db.c b/src/mess/machine/s100_dj2db.c
index 4e48b394822..2146d4c3afe 100644
--- a/src/mess/machine/s100_dj2db.c
+++ b/src/mess/machine/s100_dj2db.c
@@ -107,7 +107,7 @@ void s100_dj2db_device::fdc_drq_w(bool state)
 //-------------------------------------------------
 
 static MACHINE_CONFIG_FRAGMENT( s100_dj2db )
-	MCFG_COM8116_ADD(BR1941_TAG, XTAL_5_0688MHz, NULL, DEVWRITELINE(DEVICE_SELF_OWNER, s100_dj2db_device, fr_w), NULL)
+	MCFG_COM8116_ADD(BR1941_TAG, XTAL_5_0688MHz, NULL, DEVWRITELINE(DEVICE_SELF, s100_dj2db_device, fr_w), NULL)
 	MCFG_MB8866x_ADD(MB8866_TAG, XTAL_10MHz/5)
 
 	MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":0", s100_dj2db_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
diff --git a/src/mess/machine/s100_wunderbus.c b/src/mess/machine/s100_wunderbus.c
index 01acc16d34b..c1641d9703d 100644
--- a/src/mess/machine/s100_wunderbus.c
+++ b/src/mess/machine/s100_wunderbus.c
@@ -169,7 +169,7 @@ WRITE_LINE_MEMBER( s100_wunderbus_device::rtc_tp_w )
 //-------------------------------------------------
 
 static MACHINE_CONFIG_FRAGMENT( s100_wunderbus )
-	MCFG_PIC8259_ADD(I8259A_TAG, WRITELINE(s100_wunderbus_device, pic_int_w), VCC, NULL)
+	MCFG_PIC8259_ADD(I8259A_TAG, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, pic_int_w), VCC, NULL)
 	MCFG_INS8250_ADD(INS8250_1_TAG, ace1_intf, XTAL_18_432MHz/10)
 	MCFG_INS8250_ADD(INS8250_2_TAG, ace2_intf, XTAL_18_432MHz/10)
 	MCFG_INS8250_ADD(INS8250_3_TAG, ace3_intf, XTAL_18_432MHz/10)
@@ -177,7 +177,7 @@ static MACHINE_CONFIG_FRAGMENT( s100_wunderbus )
 	MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("serial_terminal", terminal)
 	MCFG_RS232_PORT_ADD(RS232_B_TAG, rs232b_intf, default_rs232_devices, NULL)
 	MCFG_RS232_PORT_ADD(RS232_C_TAG, rs232c_intf, default_rs232_devices, NULL)
-	MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL_32_768kHz, NULL, DEVWRITELINE(DEVICE_SELF_OWNER, s100_wunderbus_device, rtc_tp_w))
+	MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL_32_768kHz, NULL, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w))
 MACHINE_CONFIG_END