diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp
index 1fc9699b69c..186d2a640ec 100644
--- a/src/devices/machine/akiko.cpp
+++ b/src/devices/machine/akiko.cpp
@@ -153,7 +153,7 @@ void akiko_device::device_start()
 void akiko_device::device_reset()
 {
 	/* create the TOC table */
-	if ( m_cdrom != nullptr && m_cdrom->get_last_track() )
+	if ( m_cdrom->exists() && m_cdrom->get_last_track() )
 	{
 		uint8_t *p;
 		int     i, addrctrl = m_cdrom->get_adr_control( 0 );
@@ -709,7 +709,7 @@ void akiko_device::update_cdrom()
 
 			(void)cdda_getstatus(&lba);
 
-			if ( lba > 0 && m_cdrom != nullptr )
+			if ( lba > 0 && m_cdrom->exists() )
 			{
 				uint32_t  disk_pos;
 				uint32_t  track_pos;
@@ -777,7 +777,7 @@ uint32_t akiko_device::read(offs_t offset)
 	switch( offset )
 	{
 		case 0x00/4:    /* ID */
-			if ( m_cdrom != nullptr ) m_cdda->set_cdrom(m_cdrom);
+			if ( m_cdrom->exists() ) m_cdda->set_cdrom(m_cdrom);
 			return 0x0000cafe;
 
 		case 0x04/4:    /* CDROM STATUS 1 */
diff --git a/src/mame/amiga/cubo.cpp b/src/mame/amiga/cubo.cpp
index 32f4fe7071c..fa81edd3b7a 100644
--- a/src/mame/amiga/cubo.cpp
+++ b/src/mame/amiga/cubo.cpp
@@ -1125,7 +1125,7 @@ void cubo_state::cubo(machine_config &config)
 
 	MICROTOUCH(config, m_microtouch, 9600).stx().set(FUNC(cubo_state::rs232_rx_w));
 
-	CDROM(config, "cd32_cdrom").set_interface("cd32_cdrom");
+	CDROM(config, "cdrom").set_interface("cdrom");
 
 	/* fdc */
 	AMIGA_FDC(config, m_fdc, amiga_state::CLK_7M_PAL);