diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index c86a61cfa..8043f8b12 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -197,11 +197,11 @@ void LocalMap::render(const float x, const float y,
                     const float zlow, const float zhigh,
                     const float xw, const float yw, const std::string& texture)
 {
-    //mCellCamera->setFarClipDistance( (zhigh-zlow) * 1.1 );
-    mCellCamera->setFarClipDistance(0); // infinite
+    mCellCamera->setFarClipDistance( (zhigh-zlow) + 2000 );
+    mCellCamera->setNearClipDistance(50);
 
     mCellCamera->setOrthoWindow(xw, yw);
-    mCameraNode->setPosition(Vector3(x, y, zhigh+100000));
+    mCameraNode->setPosition(Vector3(x, y, zhigh+1000));
 
     // disable fog (only necessary for fixed function, the shader based
     // materials already do this through local_map material configuration)
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6586cbba6..9061f8402 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -235,8 +235,8 @@ void RenderingManager::toggleWater()
 
 void RenderingManager::cellAdded (MWWorld::Ptr::CellStore *store)
 {
-    sh::Factory::getInstance().unloadUnreferencedMaterials();
     mObjects.buildStaticGeometry (*store);
+    sh::Factory::getInstance().unloadUnreferencedMaterials();
     mDebugging->cellAdded(store);
     if (store->mCell->isExterior())
         mTerrainManager->cellAdded(store);