diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 0db93eec41d..b9f5f4d2c0a 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -656,7 +656,7 @@ static INTERRUPT_GEN( bbuster )
 
 static VIDEO_EOF( bbuster )
 {
-	address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
 
 	buffer_spriteram16_w(space,0,0,0xffff);
 	buffer_spriteram16_2_w(space,0,0,0xffff);
@@ -664,7 +664,7 @@ static VIDEO_EOF( bbuster )
 
 static VIDEO_EOF( mechatt )
 {
-	address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
 	buffer_spriteram16_w(space,0,0,0xffff);
 }
 
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index d971e4dd161..19aef467871 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -536,7 +536,7 @@ static READ8_HANDLER( berzerk_audio_r )
 
 static SOUND_RESET(berzerk)
 {
-	address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO);
 	/* clears the flip-flop controlling the volume and freq on the speech chip */
 	berzerk_audio_w(space, 4, 0x40);
 }
diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c
index c2361387989..224e6d16f70 100644
--- a/src/mame/video/st0016.c
+++ b/src/mame/video/st0016.c
@@ -426,7 +426,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
 
 static STATE_POSTLOAD( st0016_postload )
 {
-	st0016_rom_bank_w(machine,0,st0016_rom_bank);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
+	st0016_rom_bank_w(space,0,st0016_rom_bank);
 	memset(chardirty, 1, ST0016_MAX_CHAR_BANK);
 }