diff --git a/include/boost/python/suite/indexing/indexing_suite.hpp b/include/boost/python/suite/indexing/indexing_suite.hpp
index b7de0ee4..61e3593c 100644
--- a/include/boost/python/suite/indexing/indexing_suite.hpp
+++ b/include/boost/python/suite/indexing/indexing_suite.hpp
@@ -14,6 +14,7 @@
 # include <boost/python/iterator.hpp>
 # include <boost/mpl/or.hpp>
 # include <boost/mpl/not.hpp>
+# include <boost/type_traits/is_same.hpp>
 
 namespace boost { namespace python {
                    
@@ -119,7 +120,12 @@ namespace boost { namespace python {
         
         typedef mpl::or_<
             mpl::bool_<NoProxy>
-          , mpl::not_<is_class<Data> > > 
+          , mpl::not_<is_class<Data> >
+          , typename mpl::or_<
+                is_same<Data, std::string>
+              , is_same<Data, std::complex<float> >
+              , is_same<Data, std::complex<double> >
+              , is_same<Data, std::complex<long double> > >::type>
         no_proxy;
                     
         typedef detail::container_element<Container, Index, DerivedPolicies>
diff --git a/include/boost/python/suite/indexing/map_indexing_suite.hpp b/include/boost/python/suite/indexing/map_indexing_suite.hpp
index 0f5f7f3d..9322cdcc 100644
--- a/include/boost/python/suite/indexing/map_indexing_suite.hpp
+++ b/include/boost/python/suite/indexing/map_indexing_suite.hpp
@@ -26,7 +26,7 @@ namespace boost { namespace python {
     }
 
     // The map_indexing_suite class is a predefined indexing_suite derived
-    // class for wrapping std::vector (and std::vector like) classes. It provides
+    // class for wrapping std::map (and std::map like) classes. It provides
     // all the policies required by the indexing_suite (see indexing_suite).
     // Example usage:
     //