Index: binary-improvements/7dtd-server-fixes/ModInfo.xml
===================================================================
--- binary-improvements/7dtd-server-fixes/ModInfo.xml	(revision 447)
+++ binary-improvements/7dtd-server-fixes/ModInfo.xml	(revision 448)
@@ -5,5 +5,5 @@
 		<Description value="Common functions" />
 		<Author value="Christian 'Alloc' Illy" />
-		<Version value="28" />
+		<Version value="29" />
 		<Website value="http://7dtd.illy.bz" />
 	</ModInfo>
Index: binary-improvements/7dtd-server-fixes/src/LandClaimList.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/LandClaimList.cs	(revision 447)
+++ binary-improvements/7dtd-server-fixes/src/LandClaimList.cs	(revision 448)
@@ -45,5 +45,5 @@
 					PlatformUserIdentifierAbs platformId = kvp.Key.PlatformUserIdentifier;
 					PlatformUserIdentifierAbs internalId = kvp.Key.UserIdentifier;
-					PlatformUserIdentifierAbs crossPlatformId = platformId.Equals (internalId) ? null : internalId;
+					PlatformUserIdentifierAbs crossPlatformId = platformId == null || platformId.Equals (internalId) ? null : internalId;
 					p = new Player (internalId, platformId, crossPlatformId);
 				}
Index: binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs	(revision 447)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs	(revision 448)
@@ -7,4 +7,6 @@
 	[Serializable]
 	public class PersistentContainer {
+		private const string persistentDataFileName = "/AllocsPersistentData.bin";
+		
 		private Players players;
 		[OptionalField] private Attributes attributes;
@@ -44,14 +46,15 @@
 		private PersistentContainer () {
 		}
-
+		
 		public void Save () {
-			Stream stream = File.Open (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Create);
-			BinaryFormatter bFormatter = new BinaryFormatter ();
-			bFormatter.Serialize (stream, this);
-			stream.Close ();
+			lock (fileLockObject) {
+				using Stream stream = File.Open (GameIO.GetSaveGameDir () + persistentDataFileName, FileMode.Create);
+				BinaryFormatter bFormatter = new BinaryFormatter ();
+				bFormatter.Serialize (stream, this);
+			}
 		}
 
 		public static bool Load () {
-			if (!File.Exists (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
+			if (!File.Exists (GameIO.GetSaveGameDir () + persistentDataFileName)) {
 				return false;
 			}
@@ -59,8 +62,10 @@
 			try {
 				PersistentContainer obj;
-				Stream stream = File.Open (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
-				BinaryFormatter bFormatter = new BinaryFormatter ();
-				obj = (PersistentContainer) bFormatter.Deserialize (stream);
-				stream.Close ();
+				lock (fileLockObject) {
+					using Stream stream = File.Open (GameIO.GetSaveGameDir () + persistentDataFileName, FileMode.Open);
+					BinaryFormatter bFormatter = new BinaryFormatter ();
+					obj = (PersistentContainer)bFormatter.Deserialize (stream);
+				}
+
 				instance = obj;
 				return true;
@@ -72,4 +77,6 @@
 			return false;
 		}
+
+		private static readonly object fileLockObject = new();
 	}
 }
Index: binary-improvements/MapRendering/ModInfo.xml
===================================================================
--- binary-improvements/MapRendering/ModInfo.xml	(revision 447)
+++ binary-improvements/MapRendering/ModInfo.xml	(revision 448)
@@ -5,5 +5,5 @@
 		<Description value="Render the game map to image map tiles as it is uncovered" />
 		<Author value="Christian 'Alloc' Illy" />
-		<Version value="41" />
+		<Version value="42" />
 		<Website value="http://7dtd.illy.bz" />
 	</ModInfo>
Index: binary-improvements/MapRendering/Web/API/GetLandClaims.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetLandClaims.cs	(revision 447)
+++ binary-improvements/MapRendering/Web/API/GetLandClaims.cs	(revision 448)
@@ -50,5 +50,5 @@
 				claimOwners.Add (owner);
 
-				owner.Add ("steamid", new JSONString (kvp.Key.PlatformId.CombinedString));
+				owner.Add ("steamid", new JSONString (kvp.Key.PlatformId?.CombinedString ?? ""));
 				owner.Add ("crossplatformid", new JSONString (kvp.Key.CrossPlatformId?.CombinedString ?? ""));
 				owner.Add ("claimactive", new JSONBoolean (kvp.Key.LandProtectionActive));
Index: binary-improvements/bin/Mods/Allocs_CommonFunc/ModInfo.xml
===================================================================
--- binary-improvements/bin/Mods/Allocs_CommonFunc/ModInfo.xml	(revision 447)
+++ binary-improvements/bin/Mods/Allocs_CommonFunc/ModInfo.xml	(revision 448)
@@ -5,5 +5,5 @@
 		<Description value="Common functions" />
 		<Author value="Christian 'Alloc' Illy" />
-		<Version value="28" />
+		<Version value="29" />
 		<Website value="http://7dtd.illy.bz" />
 	</ModInfo>
Index: binary-improvements/bin/Mods/Allocs_WebAndMapRendering/ModInfo.xml
===================================================================
--- binary-improvements/bin/Mods/Allocs_WebAndMapRendering/ModInfo.xml	(revision 447)
+++ binary-improvements/bin/Mods/Allocs_WebAndMapRendering/ModInfo.xml	(revision 448)
@@ -5,5 +5,5 @@
 		<Description value="Render the game map to image map tiles as it is uncovered" />
 		<Author value="Christian 'Alloc' Illy" />
-		<Version value="41" />
+		<Version value="42" />
 		<Website value="http://7dtd.illy.bz" />
 	</ModInfo>