diff --git a/Makefile b/Makefile
index 3417b3fac8..b5b40bd314 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources
 mapcvtr_SRCS		= $(shell find MapConverter/ -iname '*.cs')
 mapcvtr_TARGET		= MapConverter.exe
 mapcvtr_KIND		= winexe
-mapcvtr_DEPS		= $(fileformats_TARGET)
+mapcvtr_DEPS		= $(fileformats_TARGET) $(game_TARGET)
 mapcvtr_LIBS		= $(COMMON_LIBS) $(mapcvtr_DEPS)
 
 ralint_SRCS		= $(shell find RALint/ -iname '*.cs')
diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index a8cf09b5db..f5fee78b45 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -378,8 +378,7 @@ namespace OpenRA.Editor
 					map.TopLeft = new int2((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value);
 					map.BottomRight = new int2((int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
 					map.Tileset = nmd.theater.SelectedItem as string;
-
-
+					map.Players.Add("Neutral", new PlayerReference("Neutral", Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
 					NewMap(map);
 				}
 			}
diff --git a/OpenRA.FileFormats/Map/Map.cs b/OpenRA.FileFormats/Map/Map.cs
index ceae8f7be0..cef631bc8b 100644
--- a/OpenRA.FileFormats/Map/Map.cs
+++ b/OpenRA.FileFormats/Map/Map.cs
@@ -92,9 +92,6 @@ namespace OpenRA.FileFormats
 			TopLeft = new int2(0, 0);
 			BottomRight = new int2(0, 0);
 
-			Tileset = "TEMPERAT";
-			Players.Add("Neutral", new PlayerReference("Neutral", "neutral", "allies", true, true));
-
 			Title = "Name your map here";
 			Description = "Describe your map here";
 			Author = "Your name here";
@@ -118,7 +115,7 @@ namespace OpenRA.FileFormats
 			// Players
 			if (MapFormat == 1)
 			{
-				Players.Add("Neutral", new PlayerReference("Neutral", "neutral", "allies", true, true));
+				Players.Add("Neutral", new PlayerReference("Neutral", "allies", true, true));
 			}
 			else
 			{
diff --git a/OpenRA.FileFormats/Map/PlayerReference.cs b/OpenRA.FileFormats/Map/PlayerReference.cs
index 905b6b0bf8..8acf1d3181 100644
--- a/OpenRA.FileFormats/Map/PlayerReference.cs
+++ b/OpenRA.FileFormats/Map/PlayerReference.cs
@@ -36,10 +36,9 @@ namespace OpenRA.FileFormats
 			FieldLoader.Load(this, my);
 		}
 		
-		public PlayerReference(string name, string palette, string race, bool ownsworld, bool noncombatant)
+		public PlayerReference(string name, string race, bool ownsworld, bool noncombatant)
 		{
 			Name = name;
-			Palette = palette;
 			Race = race;
 			OwnsWorld = ownsworld;
 			NonCombatant = noncombatant;