diff --git a/src/juce_appframework/gui/components/controls/juce_Toolbar.cpp b/src/juce_appframework/gui/components/controls/juce_Toolbar.cpp
index f18e7fe043..0f55755655 100644
--- a/src/juce_appframework/gui/components/controls/juce_Toolbar.cpp
+++ b/src/juce_appframework/gui/components/controls/juce_Toolbar.cpp
@@ -212,7 +212,6 @@ public:
             {
                 tc->setVisible (false);
                 const int index = oldIndexes.remove (i);
-                owner.items.insert (index, tc);
                 owner.addChildComponent (tc, index);
                 --i;
             }
diff --git a/src/juce_appframework/gui/components/special/juce_OpenGLComponent.h b/src/juce_appframework/gui/components/special/juce_OpenGLComponent.h
index 4a395289af..e0619e11cf 100644
--- a/src/juce_appframework/gui/components/special/juce_OpenGLComponent.h
+++ b/src/juce_appframework/gui/components/special/juce_OpenGLComponent.h
@@ -263,7 +263,7 @@ public:
 
         @see newOpenGLContextCreated()
     */
-    OpenGLContext* getCurrentContext() const throw();
+    OpenGLContext* getCurrentContext() const throw()            { return context; }
 
     /** Makes this component the current openGL context.