diff --git a/src/emu/cpu/z80/tmpz84c011.c b/src/emu/cpu/z80/tmpz84c011.c
index 24e0cc9ad27..d4061e8c3a3 100644
--- a/src/emu/cpu/z80/tmpz84c011.c
+++ b/src/emu/cpu/z80/tmpz84c011.c
@@ -1,7 +1,7 @@
 /***************************************************************************
 
-    Toshiba TMPZ84C011, TLCS-Z80 ASSP Family
-    Z80 CPU, CTC, CGC(6/8MHz), I/O8x5
+    Toshiba TMPZ84C011, MPUZ80/TLCS-Z80 ASSP Family
+    Z80 CPU, CTC, CGC, I/O8x5
     
     TODO:
     - CGC (clock generator/controller)
@@ -13,18 +13,18 @@
 const device_type TMPZ84C011 = &device_creator<tmpz84c011_device>;
 
 static ADDRESS_MAP_START( tmpz84c011_internal_io_map, AS_IO, 8, tmpz84c011_device )
-	AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ctc", z80ctc_device, read, write) AM_MIRROR(0xff00)
+	AM_RANGE(0x10, 0x13) AM_MIRROR(0xff00) AM_DEVREADWRITE("ctc", z80ctc_device, read, write)
 
-	AM_RANGE(0x50, 0x50) AM_READWRITE(tmpz84c011_pa_r, tmpz84c011_pa_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x51, 0x51) AM_READWRITE(tmpz84c011_pb_r, tmpz84c011_pb_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x52, 0x52) AM_READWRITE(tmpz84c011_pc_r, tmpz84c011_pc_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x30, 0x30) AM_READWRITE(tmpz84c011_pd_r, tmpz84c011_pd_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x40, 0x40) AM_READWRITE(tmpz84c011_pe_r, tmpz84c011_pe_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x54, 0x54) AM_READWRITE(tmpz84c011_dir_pa_r, tmpz84c011_dir_pa_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x55, 0x55) AM_READWRITE(tmpz84c011_dir_pb_r, tmpz84c011_dir_pb_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x56, 0x56) AM_READWRITE(tmpz84c011_dir_pc_r, tmpz84c011_dir_pc_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x34, 0x34) AM_READWRITE(tmpz84c011_dir_pd_r, tmpz84c011_dir_pd_w) AM_MIRROR(0xff00)
-	AM_RANGE(0x44, 0x44) AM_READWRITE(tmpz84c011_dir_pe_r, tmpz84c011_dir_pe_w) AM_MIRROR(0xff00)
+	AM_RANGE(0x50, 0x50) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_pa_r, tmpz84c011_pa_w)
+	AM_RANGE(0x51, 0x51) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_pb_r, tmpz84c011_pb_w)
+	AM_RANGE(0x52, 0x52) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_pc_r, tmpz84c011_pc_w)
+	AM_RANGE(0x30, 0x30) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_pd_r, tmpz84c011_pd_w)
+	AM_RANGE(0x40, 0x40) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_pe_r, tmpz84c011_pe_w)
+	AM_RANGE(0x54, 0x54) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_dir_pa_r, tmpz84c011_dir_pa_w)
+	AM_RANGE(0x55, 0x55) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_dir_pb_r, tmpz84c011_dir_pb_w)
+	AM_RANGE(0x56, 0x56) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_dir_pc_r, tmpz84c011_dir_pc_w)
+	AM_RANGE(0x34, 0x34) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_dir_pd_r, tmpz84c011_dir_pd_w)
+	AM_RANGE(0x44, 0x44) AM_MIRROR(0xff00) AM_READWRITE(tmpz84c011_dir_pe_r, tmpz84c011_dir_pe_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/emu/cpu/z80/tmpz84c011.h b/src/emu/cpu/z80/tmpz84c011.h
index 92e28c108c9..834da487e4d 100644
--- a/src/emu/cpu/z80/tmpz84c011.h
+++ b/src/emu/cpu/z80/tmpz84c011.h
@@ -1,7 +1,7 @@
 /***************************************************************************
 
-    Toshiba TMPZ84C011, TLCS-Z80 ASSP Family
-    Z80 CPU, CTC, CGC(6/8MHz), I/O8x5
+    Toshiba TMPZ84C011, MPUZ80/TLCS-Z80 ASSP Family
+    Z80 CPU, CTC, CGC, I/O8x5
 
 ***************************************************************************/
 
diff --git a/src/emu/cpu/z80/tmpz84c015.c b/src/emu/cpu/z80/tmpz84c015.c
index 013c0178672..73ab904933b 100644
--- a/src/emu/cpu/z80/tmpz84c015.c
+++ b/src/emu/cpu/z80/tmpz84c015.c
@@ -1,7 +1,7 @@
 /***************************************************************************
 
-    Toshiba TMPZ84C015, TLCS-Z80 ASSP Family
-    Z80 CPU, SIO, CTC, CGC(6/8MHz), PIO, WDT
+    Toshiba TMPZ84C015, MPUZ80/TLCS-Z80 ASSP Family
+    Z80 CPU, SIO, CTC, CGC, PIO, WDT
     
     TODO:
     - SIO configuration, or should that be up to the driver?
@@ -40,6 +40,9 @@ tmpz84c015_device::tmpz84c015_device(const machine_config &mconfig, const char *
 void tmpz84c015_device::device_start()
 {
 	z80_device::device_start();
+
+	// register for save states
+	save_item(NAME(m_irq_priority));
 }
 
 
@@ -92,8 +95,14 @@ WRITE8_MEMBER(tmpz84c015_device::irq_priority_w)
 		};
 		
 		// reconfigure first 3 entries in daisy chain
-		const char *daisy[4] = { dev[prio[data][0]], dev[prio[data][1]], dev[prio[data][2]], NULL };
-		m_daisy.init(this, (const z80_daisy_config *)daisy);
+		const z80_daisy_config daisy_chain[] =
+		{
+			{ dev[prio[data][0]] },
+			{ dev[prio[data][1]] },
+			{ dev[prio[data][2]] },
+			{ NULL }
+		};
+		m_daisy.init(this, daisy_chain);
 		
 		m_irq_priority = data;
 	}
diff --git a/src/emu/cpu/z80/tmpz84c015.h b/src/emu/cpu/z80/tmpz84c015.h
index 2385e3c85ca..8f3ddad733e 100644
--- a/src/emu/cpu/z80/tmpz84c015.h
+++ b/src/emu/cpu/z80/tmpz84c015.h
@@ -1,7 +1,7 @@
 /***************************************************************************
 
-    Toshiba TMPZ84C015, TLCS-Z80 ASSP Family
-    Z80 CPU, SIO, CTC, CGC(6/8MHz), PIO, WDT
+    Toshiba TMPZ84C015, MPUZ80/TLCS-Z80 ASSP Family
+    Z80 CPU, SIO, CTC, CGC, PIO, WDT
 
 ***************************************************************************/
 
diff --git a/src/emu/cpu/z80/z80daisy.c b/src/emu/cpu/z80/z80daisy.c
index 2c2c3bfb443..ee58fc99400 100644
--- a/src/emu/cpu/z80/z80daisy.c
+++ b/src/emu/cpu/z80/z80daisy.c
@@ -61,9 +61,9 @@ void z80_daisy_chain::init(device_t *cpudevice, const z80_daisy_config *daisy)
 	{
 		// find the device
 		device_t *target;
-		if ((target = cpudevice->siblingdevice(daisy->devname)) == NULL)
+		if ((target = cpudevice->subdevice(daisy->devname)) == NULL)
 		{
-			if ((target = cpudevice->subdevice(daisy->devname)) == NULL)
+			if ((target = cpudevice->siblingdevice(daisy->devname)) == NULL)
 				fatalerror("Unable to locate device '%s'\n", daisy->devname);
 		}