diff --git a/OpenRA.Editor/Program.cs b/OpenRA.Editor/Program.cs
index 65eeb59ae1..ac34b1c65a 100644
--- a/OpenRA.Editor/Program.cs
+++ b/OpenRA.Editor/Program.cs
@@ -13,6 +13,7 @@ using System.Globalization;
 using System.Windows.Forms;
 using System.Linq;
 using System.IO;
+using OpenRA.FileFormats;
 
 namespace OpenRA.Editor
 {
@@ -24,6 +25,7 @@ namespace OpenRA.Editor
 			if (args.Length >= 2 && args[0] == "--convert")
 			{
 				Game.modData = new ModData(args[1]);
+				FileSystem.LoadFromManifest(Game.modData.Manifest);
 				Rules.LoadRules(Game.modData.Manifest, new Map());
 				UpgradeMaps(args[1]);
 				return;
@@ -44,7 +46,7 @@ namespace OpenRA.Editor
 			foreach (var path in ModData.FindMapsIn(MapFolderPath))
             {
                 var map = new Map(path);
-				map.Save(path+".oramap");
+				map.Save(path);
             }
 		}
 		
diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 3950b024c5..14f7418f5e 100755
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -211,7 +211,7 @@ namespace OpenRA
 		
 		public static Dictionary<String, Mod> CurrentMods
 		{
-			get { return Mod.AllMods.Where( k => orderManager.LobbyInfo.GlobalSettings.Mods.Contains( k.Key )).ToDictionary( k => k.Key, k => k.Value ); }
+			get { return Mod.AllMods.Where( k => modData.Manifest.Mods.Contains( k.Key )).ToDictionary( k => k.Key, k => k.Value ); }
 		}
 
 		static Modifiers modifiers;