diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index d1c606ab4a9..8cee518dade 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -1585,12 +1585,12 @@ static INPUT_PORTS_START( scorpion )
 
 	PORT_START_TAG("IN2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Upright ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Cocktail ) )
+	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( Cocktail ) )
 	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Coinage ) )
 	PORT_DIPSETTING(    0x08, "A 1/1  B 1/1" )
 	PORT_DIPSETTING(    0x00, "A 1/1  B 1/3" )
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index a974542b055..1515b68db37 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -636,6 +636,11 @@ VIDEO_START( scramble )
 {
 	video_start_galaxian_plain(machine);
 
+	/* FIXME: This most probably needs to be adjusted 
+	 * again when RAW video params are added to scramble
+	 */
+	tilemap_set_scrolldx(bg_tilemap, 0, 0);
+
 	draw_stars = scramble_draw_stars;
 
 	draw_bullets = scramble_draw_bullets;