diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 35b304d7d11..536575cebf2 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -1638,12 +1638,12 @@ static void cps3_flashmain_w(running_machine *machine, int base, UINT32 offset,
 
 static WRITE32_HANDLER( cps3_flash1_w )
 {
-	cps3_flashmain_w(space,0,offset,data,mem_mask);
+	cps3_flashmain_w(space->machine,0,offset,data,mem_mask);
 }
 
 static WRITE32_HANDLER( cps3_flash2_w )
 {
-	cps3_flashmain_w(space,4,offset,data,mem_mask);
+	cps3_flashmain_w(space->machine,4,offset,data,mem_mask);
 }
 
 static WRITE32_HANDLER( cram_gfxflash_bank_w )
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 9cd3ff8ebc9..374fe8a7f56 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -145,7 +145,7 @@ static void f1dream_protection_w(const address_space *space)
 	else if ((prevpc == 0x27f8) || (prevpc == 0x511a) || (prevpc == 0x5142) || (prevpc == 0x516a))
 	{
 		/* The main CPU stuffs the byte for the soundlatch into 0xfffffd.*/
-		soundlatch_w(space->machine,2,ram16[0x3ffc/2]);
+		soundlatch_w(space,2,ram16[0x3ffc/2]);
 	}
 }
 
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index 0b7a66a0bba..7f1f19d7d10 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -243,5 +243,7 @@ VIDEO_UPDATE( bionicc )
 
 VIDEO_EOF( bionicc )
 {
-	buffer_spriteram16_w(machine,0,0,0xffff);
+	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/video/blktiger.c b/src/mame/video/blktiger.c
index 7e77044a80a..d6793f0d861 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -244,5 +244,7 @@ VIDEO_UPDATE( blktiger )
 
 VIDEO_EOF( blktiger )
 {
-	buffer_spriteram_w(machine,0,0);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
+	buffer_spriteram_w(space, 0, 0);
 }
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index 5b0f88c4d42..5a4c764bd22 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -136,5 +136,7 @@ VIDEO_UPDATE( commando )
 
 VIDEO_EOF( commando )
 {
-	buffer_spriteram_w(machine, 0, 0);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
+	buffer_spriteram_w(space, 0, 0);
 }
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index 5785ae2bfd7..69dbb285c23 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -243,5 +243,7 @@ VIDEO_UPDATE( exedexes )
 
 VIDEO_EOF( exedexes )
 {
-	buffer_spriteram_w(machine,0,0);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
+	buffer_spriteram_w(space, 0, 0);
 }
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index e662893017f..061555c0f38 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -156,5 +156,7 @@ VIDEO_UPDATE( gng )
 
 VIDEO_EOF( gng )
 {
-	buffer_spriteram_w(machine,0,0);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
+	buffer_spriteram_w(space,0,0);
 }
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index fa46dbbc3d3..7b54e8f4758 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -287,8 +287,10 @@ VIDEO_UPDATE( madgear )
 
 VIDEO_EOF( lastduel )
 {
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
 	/* Spriteram is always 1 frame ahead, suggesting buffering.  I can't find
         a register to control this so I assume it happens automatically
         every frame at the end of vblank */
-	buffer_spriteram16_w(machine,0,0,0xffff);
+	buffer_spriteram16_w(space,0,0,0xffff);
 }
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index 9cb74ee14b3..5388633c2a6 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -359,5 +359,7 @@ VIDEO_UPDATE( sidearms )
 
 VIDEO_EOF( sidearms )
 {
-	buffer_spriteram_w(machine, 0, 0);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
+	buffer_spriteram_w(space, 0, 0);
 }
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 633a81b8356..f815564a318 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -170,5 +170,7 @@ VIDEO_UPDATE( srumbler )
 
 VIDEO_EOF( srumbler )
 {
-	buffer_spriteram_w(machine,0,0);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
+	buffer_spriteram_w(space,0,0);
 }
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index f428ad1817e..d86b7698279 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -166,5 +166,7 @@ VIDEO_UPDATE( tigeroad )
 
 VIDEO_EOF( tigeroad )
 {
-	buffer_spriteram16_w(machine,0,0,0xffff);
+	const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
+
+	buffer_spriteram16_w(space,0,0,0xffff);
 }