diff --git a/binaries/data/mods/public/simulation/helpers/InitGame.js b/binaries/data/mods/public/simulation/helpers/InitGame.js
index e30df68834..470f444be6 100644
--- a/binaries/data/mods/public/simulation/helpers/InitGame.js
+++ b/binaries/data/mods/public/simulation/helpers/InitGame.js
@@ -22,11 +22,15 @@ function InitGame(settings)
 			cmpPlayer.SetAI(true);
 			cmpPlayer.SetCheatEnabled(true);
 		}
-		cmpPlayer.maxPop = settings.PopulationCap;
+		if (settings.PopulationCap)
+			cmpPlayer.SetMaxPopulation(settings.PopulationCap);
 
-		if (settings.mapType !== "scenario")
-			for (var resouces in cmpPlayer.resourceCount)
-				cmpPlayer.resourceCount[resouces] = settings.StartingResources;
+		if (settings.mapType !== "scenario" && settings.StartingResources)
+			var resourceCounts = cmpPlayer.GetResourceCounts();
+			var newResourceCounts = {};
+			for (var resouces in resourceCounts)
+				newResourceCounts[resouces] = settings.StartingResources;
+			cmpPlayer.SetResourceCounts(newResourceCounts);
 	}
 }
 
diff --git a/binaries/data/mods/public/simulation/helpers/Player.js b/binaries/data/mods/public/simulation/helpers/Player.js
index c51cb95b0a..3c4bff1a3b 100644
--- a/binaries/data/mods/public/simulation/helpers/Player.js
+++ b/binaries/data/mods/public/simulation/helpers/Player.js
@@ -37,7 +37,9 @@ function LoadPlayerSettings(settings, newPlayers)
 			numPlayers = settings.PlayerData.length + 1;
 		}
 		else
+		{
 			warn("Player.js: Setup has no player data - using defaults");
+		}
 
 		for (var i = 0; i < numPlayers; ++i)
 		{