diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index b8b6be880a..6042a5435b 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -178,9 +178,11 @@ namespace OpenSim.Region.Environment.Modules
                                
                                 if (m_avatarsAppearance.ContainsKey(clientView.AgentId))
                                 {
+                                    AvatarAppearance avatAppearance = null;
+                                    
                                     lock (m_avatarsAppearance)
                                     {
-                                        AvatarAppearance avatAppearance = m_avatarsAppearance[clientView.AgentId];
+                                        avatAppearance = m_avatarsAppearance[clientView.AgentId];
                                     }
                                     avatAppearance.Wearables[wear.Type].AssetID = assetId;
                                     avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index d4f4948770..82969d98b4 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -817,7 +817,7 @@ namespace OpenSim.Region.Terrain
             {
                 for (x = 0; x < h; x++)
                 {
-                    heightmap.map[x, y] = bs.ReadDouble();
+                    heightmap.Set(x, y, (double) bs.ReadSingle());
                 }
             }
 
@@ -842,7 +842,7 @@ namespace OpenSim.Region.Terrain
             {
                 for (x = 0; x < w; x++)
                 {
-                    heightmap.map[x, y] = (double) bs.ReadSingle();
+                    heightmap.Set(x, y, (double) bs.ReadSingle());
                 }
             }
 
@@ -954,7 +954,7 @@ namespace OpenSim.Region.Terrain
             {
                 for (x = 0; x < w; x++)
                 {
-                    heightmap.map[x, y] = (double) bs.ReadByte()*((double) bs.ReadByte()/127.0);
+                    heightmap.Set(x, y, (double) bs.ReadByte()*((double) bs.ReadByte()/127.0));
                     bs.ReadBytes(11); // Advance the stream to next bytes.
                 }
             }