diff --git a/src/osg/Geometry.cpp b/src/osg/Geometry.cpp
index f00e3950c..c5671abd1 100644
--- a/src/osg/Geometry.cpp
+++ b/src/osg/Geometry.cpp
@@ -516,7 +516,7 @@ void Geometry::setPrimitiveSetList(const PrimitiveSetList& primitives)
     {
         for (unsigned int primitiveSetIndex=0;primitiveSetIndex<_primitives.size();++primitiveSetIndex)
         {
-            addElementBufferObjectIfRequired(_primitives[primitiveSetIndex]);
+            addElementBufferObjectIfRequired(_primitives[primitiveSetIndex].get());
         }
 
     }
diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp
index 3ba4deadf..8e75b5c8e 100644
--- a/src/osgDB/DatabasePager.cpp
+++ b/src/osgDB/DatabasePager.cpp
@@ -1020,7 +1020,7 @@ void DatabasePager::DatabaseThread::run()
                         OSG_NOTICE<<"Using IncrementalCompileOperation"<<std::endl;
 
                         osgUtil::IncrementalCompileOperation::CompileSet* compileSet = new osgUtil::IncrementalCompileOperation::CompileSet(databaseRequest->_loadedModel.get());
-                        compileSet->_compileCompletedCallback = new DatabasePagerCompileCompletedCallback(_pager, databaseRequest);
+                        compileSet->_compileCompletedCallback = new DatabasePagerCompileCompletedCallback(_pager, databaseRequest.get());
 
                         _pager->_incrementalCompileOperation->add(compileSet);
  
diff --git a/src/osgDB/ObjectWrapper.cpp b/src/osgDB/ObjectWrapper.cpp
index 1c4c0da29..bbcc55cd1 100644
--- a/src/osgDB/ObjectWrapper.cpp
+++ b/src/osgDB/ObjectWrapper.cpp
@@ -116,7 +116,7 @@ BaseSerializer* ObjectWrapper::getSerializer( const std::string& name )
     for ( SerializerList::iterator itr=_serializers.begin(); itr!=_serializers.end(); ++itr )
     {
         if ( (*itr)->getName()==name )
-            return *itr;
+            return itr->get();
     }
     
     for ( StringList::const_iterator itr=_associates.begin(); itr!=_associates.end(); ++itr )
@@ -134,7 +134,7 @@ BaseSerializer* ObjectWrapper::getSerializer( const std::string& name )
               aitr!=assocWrapper->_serializers.end(); ++aitr )
         {
             if ( (*aitr)->getName()==name )
-                return *aitr;
+                return aitr->get();
         }
     }
     return NULL;
diff --git a/src/osgUtil/IncrementalCompileOperation.cpp b/src/osgUtil/IncrementalCompileOperation.cpp
index f50093cd7..cf877ae4c 100644
--- a/src/osgUtil/IncrementalCompileOperation.cpp
+++ b/src/osgUtil/IncrementalCompileOperation.cpp
@@ -226,7 +226,7 @@ void CompileOperator::runTimingTests(osg::RenderInfo& renderInfo)
             unsigned int numVertices = pow(2.0,double(i));
             osg::ref_ptr<osg::Geometry> geometry = createTestGeometry(numVertices, useVBO);
             double size = geometry->getGLObjectSizeHint();
-            double time = timeCompile(renderInfo, geometry);
+            double time = timeCompile(renderInfo, geometry.get());
             OSG_NOTICE<<"   numVertices = "<<numVertices<<" size = "<<size<<", time = "<<time*1000.0<<"ms rate= "<<(size/time)*Mbsec<<"Mb/sec"<<std::endl;
         }
     }
@@ -239,7 +239,7 @@ void CompileOperator::runTimingTests(osg::RenderInfo& renderInfo)
             unsigned int numVertices = pow(2.0,double(i));
             osg::ref_ptr<osg::Geometry> geometry = createTestGeometry(numVertices, useVBO);
             double size = geometry->getGLObjectSizeHint();
-            double time = timeCompile(renderInfo, geometry);
+            double time = timeCompile(renderInfo, geometry.get());
             OSG_NOTICE<<"   numVertices = "<<numVertices<<" size = "<<size<<", time = "<<time*1000.0<<"ms rate= "<<(size/time)*Mbsec<<"Mb/sec"<<std::endl;
         }
     }