diff --git a/include/boost/python/override.hpp b/include/boost/python/override.hpp
index dbc00303..29affd59 100755
--- a/include/boost/python/override.hpp
+++ b/include/boost/python/override.hpp
@@ -33,7 +33,7 @@ namespace detail
   class method_result
   {
    private:
-      friend class override;
+      friend class boost::python::override;
       explicit method_result(PyObject* x)
         : m_obj(x)
       {}
diff --git a/include/boost/python/wrapper.hpp b/include/boost/python/wrapper.hpp
index 37d24e76..d8aa9391 100755
--- a/include/boost/python/wrapper.hpp
+++ b/include/boost/python/wrapper.hpp
@@ -15,12 +15,13 @@ template <class T>
 class wrapper : public detail::wrapper_base
 {
 #   if defined(BOOST_PYTHON_NO_SFINAE)
+ public:
     typedef T _wrapper_wrapped_type_;
 #   endif 
  protected:
     override get_override(char const* name) const
     {
-        return this->wrapper_base::get_override(
+        return this->detail::wrapper_base::get_override(
             name, converter::registered<T>::converters.get_class_object());
     }
 };