diff --git a/OpenRA.Mods.RA/Air/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs
index 9e83148263..29f8c7a480 100755
--- a/OpenRA.Mods.RA/Air/Aircraft.cs
+++ b/OpenRA.Mods.RA/Air/Aircraft.cs
@@ -154,7 +154,7 @@ namespace OpenRA.Mods.RA.Air
 
 		public WVec FlyStep(int facing)
 		{
-			var speed = MovementSpeed * 7 * 1024 / (Game.CellSize * 32);
+			var speed = MovementSpeed;
 			var dir = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(facing));
 			return speed * dir / 1024;
 		}
diff --git a/OpenRA.Mods.RA/Air/ReturnToBase.cs b/OpenRA.Mods.RA/Air/ReturnToBase.cs
index 2491b1e715..69886209f5 100755
--- a/OpenRA.Mods.RA/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.RA.Air
 			var approachStart = landPos + new WVec(-landDistance, 0, altitude);
 
 			// Add 10% to the turning radius to ensure we have enough room
-			var speed = plane.MovementSpeed * 1024 / (Game.CellSize * 5);
+			var speed = plane.MovementSpeed * 32 / 35;
 			var turnRadius = (int)(141 * speed / planeInfo.ROT / (float)Math.PI);
 
 			// Find the center of the turning circles for clockwise and counterclockwise turns
diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs
index c2bf81bab3..8b80d292e6 100755
--- a/OpenRA.Mods.RA/Move/Mobile.cs
+++ b/OpenRA.Mods.RA/Move/Mobile.cs
@@ -444,7 +444,7 @@ namespace OpenRA.Mods.RA.Move
 			decimal speed = Info.Speed * Info.TerrainSpeeds[type].Speed;
 			foreach (var t in self.TraitsImplementing<ISpeedModifier>())
 				speed *= t.GetSpeedModifier();
-			return (int)(speed / 100) * 1024 / (3 * Game.CellSize);
+			return (int)(speed / 100);
 		}
 
 		public void AddInfluence()