diff --git a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
index 2379d5e131..91a9357e74 100644
--- a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
@@ -111,7 +111,7 @@ namespace OpenRA.Mods.Common.Activities
 
 			if (ShouldLandAtBuilding(self, dest))
 			{
-				var exit = dest.FirstExitOrDefault(null);
+				var exit = dest.FirstExitOrDefault();
 				var offset = exit != null ? exit.Info.SpawnOffset : WVec.Zero;
 				if (aircraft.Info.TurnToDock || !aircraft.Info.VTOL)
 					facing = aircraft.Info.InitialFacing;
diff --git a/OpenRA.Mods.Common/Traits/Buildings/Exit.cs b/OpenRA.Mods.Common/Traits/Buildings/Exit.cs
index 6f4ffc88ba..9684ddcbc2 100644
--- a/OpenRA.Mods.Common/Traits/Buildings/Exit.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/Exit.cs
@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits
 				.OrderBy(e => e.Info.Priority);
 
 			if (string.IsNullOrEmpty(productionType))
-				return all.FirstOrDefault(e => e.Info.ProductionTypes.Count == 0);
+				return all.FirstOrDefault();
 
 			return all.FirstOrDefault(e => e.Info.ProductionTypes.Count == 0 || e.Info.ProductionTypes.Contains(productionType));
 		}
@@ -64,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits
 				.Where(Exts.IsTraitEnabled);
 
 			if (string.IsNullOrEmpty(productionType))
-				return all.Where(e => e.Info.ProductionTypes.Count == 0);
+				return all;
 
 			return all.Where(e => e.Info.ProductionTypes.Count == 0 || e.Info.ProductionTypes.Contains(productionType));
 		}