diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs
index 6452eba428..1891575719 100755
--- a/OpenRA.Game/Network/UnitOrders.cs
+++ b/OpenRA.Game/Network/UnitOrders.cs
@@ -25,7 +25,7 @@ namespace OpenRA.Network
 					var client = Game.LobbyInfo.Clients.FirstOrDefault(c => c.Index == clientId);
 					if (client != null)
 					{
-						var player = Game.world.players.Values.FirstOrDefault(p => p.Index == client.Index);
+						var player = world.players.Values.FirstOrDefault(p => p.Index == client.Index);
 						if (player != null && player.WinState == WinState.Lost)
 							Game.AddChatLine(client.Color1, client.Name + " (Dead)", order.TargetString);
 						else
@@ -38,9 +38,9 @@ namespace OpenRA.Network
 					var client = Game.LobbyInfo.Clients.FirstOrDefault(c => c.Index == clientId);
 					if (client != null)
 					{
-						var player = Game.world.players.Values.FirstOrDefault(p => p.Index == client.Index);
+						var player = world.players.Values.FirstOrDefault(p => p.Index == client.Index);
 						var display = (world.GameHasStarted) ? 
-							player != null && (Game.world.LocalPlayer != null && player.Stances[Game.world.LocalPlayer] == Stance.Ally 
+							player != null && (world.LocalPlayer != null && player.Stances[world.LocalPlayer] == Stance.Ally 
 								|| player.WinState == WinState.Lost) :
 							client == Game.LocalClient || (client.Team == Game.LocalClient.Team && client.Team != 0);
 						
diff --git a/OpenRA.Game/Traits/Mobile.cs b/OpenRA.Game/Traits/Mobile.cs
index 4f52ca93bb..e3894e4e3a 100644
--- a/OpenRA.Game/Traits/Mobile.cs
+++ b/OpenRA.Game/Traits/Mobile.cs
@@ -251,8 +251,8 @@ namespace OpenRA.Traits
 				return;		/* don't allow ourselves to be pushed around
 							 * by the enemy! */
 
-			if (self.GetCurrentActivity() is Move)
-				return;		/* we're *already* moving; nudging isn't going to help */
+			if (!self.IsIdle)
+				return;		/* don't nudge if we're busy doing something! */
 
 			// pick an adjacent available cell.
 			var availCells = new List<int2>();