diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 3fc933d04b5..b3a64d65fef 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -116,7 +116,8 @@ static WRITE8_HANDLER( aerofgt_sh_bankswitch_w )
 
 static MACHINE_RESET( aerofgt )
 {
-	aerofgt_sh_bankswitch_w(machine,0,0);	/* needed by spinlbrk */
+	address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+	aerofgt_sh_bankswitch_w(space,0,0);	/* needed by spinlbrk */
 }
 
 
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 237cb1380ed..bde7832928c 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -591,12 +591,13 @@ static INTERRUPT_GEN( slave_interrupt )
 
 static MACHINE_RESET( airbustr )
 {
+	address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
 	soundlatch_status = soundlatch2_status = 0;
 	master_addr = 0xff;
 	slave_addr = 0xfd;
-	master_bankswitch_w(machine, 0, 0x02);
-	slave_bankswitch_w(machine, 0, 0x02);
-	sound_bankswitch_w(machine, 0, 0x02);
+	master_bankswitch_w(space, 0, 0x02);
+	slave_bankswitch_w(space, 0, 0x02);
+	sound_bankswitch_w(space, 0, 0x02);
 }
 
 /* Machine Driver */
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index eaa21bda4c9..fd220355384 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -131,7 +131,7 @@ static READ8_HANDLER( aquarium_oki_r )
 static WRITE8_HANDLER( aquarium_oki_w )
 {
 	logerror("Z80-PC:%04x Writing %04x to the OKI M6295\n",cpu_get_previouspc(space->cpu),aquarium_snd_bitswap(data));
-	okim6295_data_0_w( space->machine, 0, (aquarium_snd_bitswap(data)) );
+	okim6295_data_0_w( space, 0, (aquarium_snd_bitswap(data)) );
 }
 
 
@@ -317,7 +317,7 @@ static DRIVER_INIT( aquarium )
 	}
 
 	/* reset the sound bank */
-	aquarium_z80_bank_w(machine, 0, 0);
+	aquarium_z80_bank_w(cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_IO), 0, 0);
 }
 
 
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 843fd1f5f3d..d67123ebe85 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -81,7 +81,7 @@ static MACHINE_RESET( atarig1 )
 static WRITE16_HANDLER( mo_control_w )
 {
 	if (ACCESSING_BITS_0_7)
-		atarirle_control_w(space, 0, data & 7);
+		atarirle_control_w(space->machine, 0, data & 7);
 }