diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index e6bc82a788..72d1a4c1be 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -117,6 +117,20 @@ namespace OpenSim.Framework.Types
             }
         }
 
+        // Only used for remote regions , ie ones not in the current instance
+        private uint m_remotingPort;
+        public uint RemotingPort
+        {
+            get
+            {
+                return m_remotingPort;
+            }
+            set
+            {
+                m_remotingPort = value;
+            }
+        }
+
         public string DataStore = "";
         public bool isSandbox = false;
 
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 50a31c6d61..1cadf9b4cd 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -151,20 +151,23 @@ namespace OpenSim.Region.Communications.OGS1
 
             List<MapBlockData> neighbours = new List<MapBlockData>();
 
-            foreach (Hashtable n in (Hashtable)respData.Values)
+            foreach (ArrayList a in respData.Values)
             {
-                MapBlockData neighbour = new MapBlockData();
+                foreach (Hashtable n in a)
+                {
+                    MapBlockData neighbour = new MapBlockData();
 
-                neighbour.X = (ushort)n["x"];
-                neighbour.Y = (ushort)n["y"];
+                    neighbour.X = Convert.ToUInt16(n["x"]);
+                    neighbour.Y = Convert.ToUInt16(n["y"]);
 
-                neighbour.Name = (string)n["name"];
-                neighbour.Access = (byte)n["access"];
-                neighbour.RegionFlags = (uint)n["region-flags"];
-                neighbour.WaterHeight = (byte)n["water-height"];
-                neighbour.MapImageId = (string)n["map-image-id"];
+                    neighbour.Name = (string)n["name"];
+                    neighbour.Access = Convert.ToByte(n["access"]);
+                    neighbour.RegionFlags = Convert.ToUInt32(n["region-flags"]);
+                    neighbour.WaterHeight = Convert.ToByte(n["water-height"]);
+                    neighbour.MapImageId = (string)n["map-image-id"];
 
-                neighbours.Add(neighbour);
+                    neighbours.Add(neighbour);
+                }
             }
 
             return neighbours;