Index: binary-improvements/MapRendering/Web/API/GetLandClaims.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetLandClaims.cs	(revision 420)
+++ binary-improvements/MapRendering/Web/API/GetLandClaims.cs	(revision 446)
@@ -51,4 +51,5 @@
 
 				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/MapRendering/Web/API/GetPlayerInventories.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetPlayerInventories.cs	(revision 420)
+++ binary-improvements/MapRendering/Web/API/GetPlayerInventories.cs	(revision 446)
@@ -20,5 +20,5 @@
 
 				if (p.IsOnline) {
-					AllInventoriesResult.Add (GetPlayerInventory.DoPlayer (kvp.Key.CombinedString, p, showIconColor, showIconName));
+					AllInventoriesResult.Add (GetPlayerInventory.DoPlayer (p, showIconColor, showIconName));
 				}
 			}
Index: binary-improvements/MapRendering/Web/API/GetPlayerInventory.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetPlayerInventory.cs	(revision 420)
+++ binary-improvements/MapRendering/Web/API/GetPlayerInventory.cs	(revision 446)
@@ -21,5 +21,5 @@
 			}
 
-			Player p = PersistentContainer.Instance.Players [userId, false];
+			Player p = PersistentContainer.Instance.Players.GetByUserId (userId);
 			if (p == null) {
 				_resp.StatusCode = (int) HttpStatusCode.NotFound;
@@ -30,5 +30,5 @@
 			GetInventoryArguments (_req, out bool showIconColor, out bool showIconName);
 
-			JSONObject result = DoPlayer (userIdString, p, showIconColor, showIconName);
+			JSONObject result = DoPlayer (p, showIconColor, showIconName);
 
 			WriteJSON (_resp, result);
@@ -45,5 +45,5 @@
 		}
 
-		internal static JSONObject DoPlayer (string _steamId, Player _player, bool _showIconColor, bool _showIconName) {
+		internal static JSONObject DoPlayer (Player _player, bool _showIconColor, bool _showIconName) {
 			PersistentData.Inventory inv = _player.Inventory;
 
@@ -53,5 +53,6 @@
 			JSONArray belt = new JSONArray ();
 			JSONObject equipment = new JSONObject ();
-			result.Add ("userid", new JSONString (_steamId));
+			result.Add ("userid", new JSONString (_player.PlatformId.CombinedString));
+			result.Add ("crossplatformid", new JSONString (_player.CrossPlatformId?.CombinedString ?? ""));
 			result.Add ("entityid", new JSONNumber (_player.EntityID));
 			result.Add ("playername", new JSONString (_player.Name));
Index: binary-improvements/MapRendering/Web/API/GetPlayerList.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetPlayerList.cs	(revision 420)
+++ binary-improvements/MapRendering/Web/API/GetPlayerList.cs	(revision 446)
@@ -49,5 +49,5 @@
 				Player p = kvp.Value;
 
-				if (bViewAll || p.PlatformId.Equals (userId)) {
+				if (bViewAll || p.InternalId.Equals (userId)) {
 					JSONObject pos = new JSONObject ();
 					pos.Add ("x", new JSONNumber (p.LastPosition.x));
@@ -56,5 +56,6 @@
 
 					JSONObject pJson = new JSONObject ();
-					pJson.Add ("steamid", new JSONString (kvp.Key.CombinedString));
+					pJson.Add ("steamid", new JSONString (kvp.Value.PlatformId.CombinedString));
+					pJson.Add ("crossplatformid", new JSONString (kvp.Value.CrossPlatformId?.CombinedString ?? ""));
 					pJson.Add ("entityid", new JSONNumber (p.EntityID));
 					pJson.Add ("ip", new JSONString (p.IP));
Index: binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs	(revision 420)
+++ binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs	(revision 446)
@@ -32,5 +32,5 @@
 
 				if (listOffline || p.IsOnline) {
-					if (bViewAll || p.PlatformId.Equals (userId)) {
+					if (bViewAll || p.InternalId.Equals (userId)) {
 						JSONObject pos = new JSONObject ();
 						pos.Add ("x", new JSONNumber (p.LastPosition.x));
@@ -39,5 +39,6 @@
 
 						JSONObject pJson = new JSONObject ();
-						pJson.Add ("steamid", new JSONString (kvp.Key.CombinedString));
+						pJson.Add ("steamid", new JSONString (kvp.Value.PlatformId.CombinedString));
+						pJson.Add ("crossplatformid", new JSONString (kvp.Value.CrossPlatformId?.CombinedString ?? ""));
 
 						//					pJson.Add("entityid", new JSONNumber (p.EntityID));
Index: binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs
===================================================================
--- binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs	(revision 420)
+++ binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs	(revision 446)
@@ -13,5 +13,5 @@
 			foreach (KeyValuePair<int, EntityPlayer> current in w.Players.dict) {
 				ClientInfo ci = ConnectionManager.Instance.Clients.ForEntityId (current.Key);
-				Player player = PersistentContainer.Instance.Players [ci.InternalId, false];
+				Player player = PersistentContainer.Instance.Players.GetByInternalId (ci.InternalId);
 
 				JSONObject pos = new JSONObject ();
@@ -22,4 +22,5 @@
 				JSONObject p = new JSONObject ();
 				p.Add ("steamid", new JSONString (ci.PlatformId.CombinedString));
+				p.Add ("crossplatformid", new JSONString (ci.CrossplatformId?.CombinedString ?? ""));
 				p.Add ("entityid", new JSONNumber (ci.entityId));
 				p.Add ("ip", new JSONString (ci.ip));