diff --git a/OpenRa.Game/Graphics/Region.cs b/OpenRa.Game/Graphics/Region.cs
index 093ab919fc..0f66d54723 100644
--- a/OpenRa.Game/Graphics/Region.cs
+++ b/OpenRa.Game/Graphics/Region.cs
@@ -44,7 +44,7 @@ namespace OpenRa.Game.Graphics
             {
                 Button = mi.Button,
                 Event = mi.Event,
-                Location = mi.Location - Location
+                Location = mi.Location - location
             });
             return mouseHandler != null;
         }
diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs
index 8ea7307a13..fca1371b5b 100644
--- a/OpenRa.Game/MainWindow.cs
+++ b/OpenRa.Game/MainWindow.cs
@@ -49,9 +49,6 @@ namespace OpenRa.Game
 			game.world.Add( new Unit( "mcv", new int2( 5, 5 ), game.players[ 3 ], game ) );
 			game.world.Add( new Unit( "mcv", new int2( 7, 5 ), game.players[ 2 ], game ) );
 		
-
-			game.world.Add( controlled = new TurretedUnit( "jeep", new int2( 9, 7 ), game.players[ 1 ], game ) );
-
             game.world.Add(controlled = new Unit("mcv", new int2(9, 5), game.players[1], game));
 
 			game.controller.orderGenerator = controlled;
@@ -89,7 +86,7 @@ namespace OpenRa.Game
 		{
 			base.OnMouseMove(e);
 
-			if (e.Button == MouseButtons.Right)
+			if (e.Button == MouseButtons.Middle)
 			{
 				int2 p = new int2(e.Location);
 				game.viewport.Scroll(lastPos - p);