diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index b529336eb6..560edfcb4d 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -45,7 +45,7 @@ namespace MWRender
         }
     }
 
-    const std::string& getModel(int type, const std::string& id, const MWWorld::ESMStore& store)
+    std::string getModel(int type, const std::string& id, const MWWorld::ESMStore& store)
     {
         switch (type)
         {
@@ -57,7 +57,8 @@ namespace MWRender
             return store.get<ESM::Door>().searchStatic(id)->mModel;
           case ESM::REC_CONT:
             return store.get<ESM::Container>().searchStatic(id)->mModel;
-          default: throw std::exception();
+          default:
+            return std::string();
         }
     }
 
@@ -340,7 +341,7 @@ namespace MWRender
             auto emplaced = nodes.emplace(cnode, InstanceList());
             if (emplaced.second)
             {
-                const_cast<osg::Node*>(cnode.get())->accept(analyzeVisitor);
+                const_cast<osg::Node*>(cnode.get())->accept(analyzeVisitor); // const-trickery required because there is no const version of NodeVisitor
                 emplaced.first->second.mAnalyzeResult = analyzeVisitor.retrieveResult();
             }
             emplaced.first->second.mInstances.push_back(&ref);
@@ -410,8 +411,9 @@ namespace MWRender
 
         group->getBound();
         group->setNodeMask(Mask_Static);
-
-        group->getOrCreateUserDataContainer()->addUserObject(templateRefs);
+        osg::UserDataContainer* udc = group->getOrCreateUserDataContainer();
+        udc->addUserObject(templateRefs);
+        udc->addUserObject(mergeGroup); // for ICO ref counting
 
         return group;
     }
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index 16de6e8bc6..56f393c7b6 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -31,8 +31,6 @@ namespace MWRender
 
         osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, const osg::Vec3f& viewPoint, bool compile);
 
-        virtual void setExpiryDelay(double expiryDelay) override { mExpiryDelay = 0.5f; }
-
         virtual unsigned int getNodeMask() override;
 
         void enableObject(const ESM::RefNum & refnum, bool enabled);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 1709a3d149..f4a605bca9 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -717,8 +717,14 @@ namespace Resource
         if (mIncrementalCompileOperation)
         {
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*mIncrementalCompileOperation->getToCompiledMutex());
-            while (mIncrementalCompileOperation->getToCompile().size() > 1000)
-                mIncrementalCompileOperation->getToCompile().pop_front();
+            osgUtil::IncrementalCompileOperation::CompileSets& sets = mIncrementalCompileOperation->getToCompile();
+            for(osgUtil::IncrementalCompileOperation::CompileSets::iterator it = sets.begin(); it != sets.end();)
+            {
+                if ((*it)->_subgraphToCompile->referenceCount() <= 2)
+                    it = sets.erase(it);
+                else
+                    ++it;
+            }
         }
     }
 
diff --git a/components/terrain/chunkmanager.hpp b/components/terrain/chunkmanager.hpp
index e323da6a4f..87770fafb4 100644
--- a/components/terrain/chunkmanager.hpp
+++ b/components/terrain/chunkmanager.hpp
@@ -50,8 +50,6 @@ namespace Terrain
 
         void releaseGLObjects(osg::State* state) override;
 
-        virtual void setExpiryDelay(double expiryDelay) override { mExpiryDelay = 0.5f; }
-
     private:
         osg::ref_ptr<osg::Node> createChunk(float size, const osg::Vec2f& center, unsigned char lod, unsigned int lodFlags, bool compile);
 
diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index d252149b2e..69291f6d8c 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -325,7 +325,7 @@ void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, f
 
     if (!entry.mRenderingNode)
     {
-        auto pat = new SceneUtil::PositionAttitudeTransform;
+        osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pat = new SceneUtil::PositionAttitudeTransform;
         pat->setPosition(osg::Vec3f(entry.mNode->getCenter().x()*cellWorldSize, entry.mNode->getCenter().y()*cellWorldSize, 0.f));
 
         const osg::Vec2f& center = entry.mNode->getCenter();