diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index df875d5b73..7c0c5f90a7 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2546,7 +2546,9 @@ namespace OpenSim.Framework
                 (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24),
                 (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle >> 56),
                 (byte)x, (byte)(x >> 8), 0, 0,
-                (byte)y, (byte)(y >> 8), 0, 0 };
+                (byte)y, (byte)(y >> 8), 0, 0
+            };
+
             return new UUID(bytes, 0);
         }
 
@@ -2557,7 +2559,8 @@ namespace OpenSim.Framework
                 (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24),
                 (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle >> 56),
                 (byte)x, (byte)(x >> 8), (byte)z, (byte)(z >> 8),
-                (byte)y, (byte)(y >> 8), 0, 0 };
+                (byte)y, (byte)(y >> 8), 0, 0
+            };
             return new UUID(bytes, 0);
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 1da6e3702d..6a9e12c890 100755
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -795,14 +795,20 @@ namespace OpenSim.Region.CoreModules.World.Land
                         }
                     }
                 }
-                
+
                 m_landList.Add(newLandLocalID, new_land);
                 m_landGlobalIDs[new_land.LandData.GlobalID] = newLandLocalID;
-                m_landFakeIDs[new_land.LandData.FakeID] = newLandLocalID;
+                if(new_land.LandData.FakeID.IsNotZero())
+                    m_landFakeIDs[new_land.LandData.FakeID] = newLandLocalID;
                 m_lastLandLocalID++;
             }
 
             new_land.ForceUpdateLandInfo();
+            lock (m_landList)
+            {
+                m_landFakeIDs[new_land.LandData.FakeID] = new_land.LandData.LocalID;
+            }
+
             m_scene.EventManager.TriggerLandObjectAdded(new_land);
 
             return new_land;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 48c21bafd6..d4f3dc92a4 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -69,6 +69,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     {
                         obj.ResetIDs();
                     }
+                    else
+                        obj.SetPartsInventoryChanged(false);
                     //if we want this to be a import method then we need new uuids for the object to avoid any clashes
                     //obj.RegenerateFullIDs();