diff --git a/include/osg/CameraNode b/include/osg/CameraNode
index 33f870d1e..e1e4eac66 100644
--- a/include/osg/CameraNode
+++ b/include/osg/CameraNode
@@ -193,10 +193,10 @@ class OSG_EXPORT CameraNode : public Transform, public CullSettings
 
 
         /** Set the draw buffer for a given fragment output position to specified draw buffer. */
-        void setDrawBuffer(unsigned int pos, GLenum buffer);
+        void setDrawBuffer(unsigned int pos, GLenum buffer) { _drawBufferList[pos] = buffer; }
 
         /** Get the draw buffer for a given fragment output position. */
-        GLenum getDrawBuffer(unsigned int pos);
+        GLenum getDrawBuffer(unsigned int pos) const { return _drawBufferList[pos]; }
         
         typedef std::vector<GLenum> DrawBufferList;
 
diff --git a/src/osgUtil/RenderToTextureStage.cpp b/src/osgUtil/RenderToTextureStage.cpp
index 33a2ad3f9..5da128190 100644
--- a/src/osgUtil/RenderToTextureStage.cpp
+++ b/src/osgUtil/RenderToTextureStage.cpp
@@ -41,7 +41,9 @@ void RenderToTextureStage::draw(osg::State& state,RenderLeaf*& previous)
     //cout << "begining RTTS draw "<<this<< "  "<<_viewport->x()<<","<< _viewport->y()<<","<< _viewport->width()<<","<< _viewport->height()<<std::endl;
     
     osg::FBOExtensions* fbo_ext = _fbo.valid() ? osg::FBOExtensions::instance(state.getContextID()) : 0;
-    if (fbo_ext)
+    bool fbo_supported = fbo_ext && fbo_ext->isSupported();
+
+    if (fbo_supported)
     {
         _fbo->apply(state);
     }
@@ -50,7 +52,7 @@ void RenderToTextureStage::draw(osg::State& state,RenderLeaf*& previous)
     RenderStage::draw(state,previous);
 
     // now copy the rendered image to attached texture.
-    if (_texture.valid() && !fbo_ext)
+    if (_texture.valid() && !fbo_supported)
     {
         //cout << "        reading "<<this<< "  "<<_viewport->x()<<","<< _viewport->y()<<","<< _viewport->width()<<","<< _viewport->height()<<std::endl;
 
@@ -60,9 +62,10 @@ void RenderToTextureStage::draw(osg::State& state,RenderLeaf*& previous)
     if (_image.valid())
         _image->readPixels(_viewport->x(),_viewport->y(),_viewport->width(),_viewport->height(),_imageReadPixelFormat,_imageReadPixelDataType);
         
-    if (fbo_ext)
+    if (fbo_supported)
     {
         fbo_ext->glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     }
 
 }
+