Index: binary-improvements/7dtd-server-fixes/src/API.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/API.cs	(revision 455)
+++ binary-improvements/7dtd-server-fixes/src/API.cs	(revision 488)
@@ -47,4 +47,8 @@
 
 		private static void PlayerSpawned (ClientInfo _cInfo, RespawnType _respawnReason, Vector3i _spawnPos) {
+			if (_cInfo == null) {
+				return;
+			}
+			
 			PersistentContainer.Instance.Players.GetOrCreate (_cInfo.InternalId, _cInfo.PlatformId, _cInfo.CrossplatformId).SetOnline (_cInfo);
 			PersistentContainer.Instance.Save ();
@@ -54,5 +58,5 @@
 
 		private static bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName,
-			bool _localizeMain, List<int> _recipientEntityIds) {
+			List<int> _recipientEntityIds) {
 			if (string.IsNullOrEmpty (_msg) || !_msg.EqualsCaseInsensitive ("/alloc")) {
 				return true;
@@ -61,5 +65,5 @@
 			if (_cInfo != null) {
 				Log.Out ($"Sent chat hook reply to {_cInfo.InternalId}");
-				_cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, ANSWER, "", false, null));
+				_cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, ANSWER, "",  null));
 			} else {
 				Log.Error ($"ChatHookExample: Argument _cInfo null on message: {_msg}");
Index: binary-improvements/7dtd-server-fixes/src/LandClaimList.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/LandClaimList.cs	(revision 455)
+++ binary-improvements/7dtd-server-fixes/src/LandClaimList.cs	(revision 488)
@@ -41,8 +41,8 @@
 
 			foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
-				Player p = PersistentContainer.Instance.Players.GetByInternalId (kvp.Key.UserIdentifier);
+				Player p = PersistentContainer.Instance.Players.GetByInternalId (kvp.Key.PrimaryId);
 				if (p == null) {
-					PlatformUserIdentifierAbs platformId = kvp.Key.PlatformUserIdentifier;
-					PlatformUserIdentifierAbs internalId = kvp.Key.UserIdentifier;
+					PlatformUserIdentifierAbs platformId = kvp.Key.NativeId;
+					PlatformUserIdentifierAbs internalId = kvp.Key.PrimaryId;
 					PlatformUserIdentifierAbs crossPlatformId = platformId == null || platformId.Equals (internalId) ? null : internalId;
 					p = new Player (internalId, platformId, crossPlatformId);