diff --git a/OpenRA.Game/Map/MapCache.cs b/OpenRA.Game/Map/MapCache.cs
index 367a1b0fb9..b116df9d63 100644
--- a/OpenRA.Game/Map/MapCache.cs
+++ b/OpenRA.Game/Map/MapCache.cs
@@ -81,7 +81,7 @@ namespace OpenRA
 			if (!modData.Manifest.Contains<MapGrid>())
 				return;
 
-			var mapGrid = Game.ModData.Manifest.Get<MapGrid>();
+			var mapGrid = modData.Manifest.Get<MapGrid>();
 			foreach (var kv in MapLocations)
 			{
 				foreach (var map in kv.Key.Contents)
diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
index a51f487910..6271ecdc01 100644
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -418,7 +418,7 @@ namespace OpenRA.Server
 			int latency = 1;
 			if (!LobbyInfo.IsSinglePlayer)
 			{
-				var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>();
+				var gameSpeeds = ModData.Manifest.Get<GameSpeeds>();
 				GameSpeed speed;
 				if (gameSpeeds.Speeds.TryGetValue(LobbyInfo.GlobalSettings.GameSpeedType, out speed))
 					latency = speed.OrderLatency;
diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
index 671cb96374..55a3731a8c 100644
--- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
@@ -719,7 +719,7 @@ namespace OpenRA.Mods.Common.Server
 							return true;
 						}
 
-						var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>();
+						var gameSpeeds = server.ModData.Manifest.Get<GameSpeeds>();
 
 						GameSpeed speed;
 						if (!gameSpeeds.Speeds.TryGetValue(s, out speed))