diff --git a/FileExtractor/FileExtractor.cs b/FileExtractor/FileExtractor.cs
index 51b8a27fd5..c1c084a473 100644
--- a/FileExtractor/FileExtractor.cs
+++ b/FileExtractor/FileExtractor.cs
@@ -1,6 +1,6 @@
-using System;
+using System;
+using System.IO;
 using OpenRA.FileFormats;
-using System.IO;
 
 namespace FileExtractor
 {
diff --git a/OpenRA.Game/Map.cs b/OpenRA.Game/Map.cs
index 5787581936..e3191a583d 100755
--- a/OpenRA.Game/Map.cs
+++ b/OpenRA.Game/Map.cs
@@ -90,10 +90,10 @@ namespace OpenRA
 
 		class Format2ActorReference
 		{
-			public string Id;
-			public string Type;
-			public int2 Location;
-			public string Owner;
+			public string Id = null;
+			public string Type = null;
+			public int2 Location = int2.Zero;
+			public string Owner = null;
 		}
 
 		public Map(IFolder package)