diff --git a/OpenRA.Game/Traits/World/SpatialBins.cs b/OpenRA.Game/Traits/World/SpatialBins.cs
index 521ffae2ac..c37866f155 100644
--- a/OpenRA.Game/Traits/World/SpatialBins.cs
+++ b/OpenRA.Game/Traits/World/SpatialBins.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -34,16 +34,15 @@ namespace OpenRA.Traits
 
 			foreach (var a in self.World.Actors)
 			{
-				if (a.Location.X >= self.World.Map.MapSize
-					|| a.Location.Y >= self.World.Map.MapSize)
+				if (!self.World.Map.IsInMap(a.Location))
 					continue;
-
+				
 				var bounds = a.GetBounds(true);
 				var i1 = (int)bounds.Left / scale;
 				var i2 = (int)bounds.Right / scale;
 				var j1 = (int)bounds.Top / scale;
 				var j2 = (int)bounds.Bottom / scale;
-
+				
 				for (var j = j1; j <= j2; j++)
 					for (var i = i1; i <= i2; i++)
 						bins[i, j].Add(a);
diff --git a/OpenRA.Mods.Cnc/ProductionAirdrop.cs b/OpenRA.Mods.Cnc/ProductionAirdrop.cs
index 16b4a13671..af03f7287b 100644
--- a/OpenRA.Mods.Cnc/ProductionAirdrop.cs
+++ b/OpenRA.Mods.Cnc/ProductionAirdrop.cs
@@ -48,6 +48,7 @@ namespace OpenRA.Mods.Cnc
 			{
 				var a = w.CreateActor("C17", startPos, owner);
 				var cargo = a.traits.Get<Cargo>();
+				a.traits.Get<Unit>().Facing = 64;
 
 				var newUnit = new Actor(self.World, producee.Name, new int2(0, 0), self.Owner);
 				cargo.Load(a, newUnit);