diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h
index 3147d0637a6..dc3b5dc12b6 100644
--- a/STL_Extension/include/CGAL/iterator.h
+++ b/STL_Extension/include/CGAL/iterator.h
@@ -1185,13 +1185,13 @@ public:
 
   typedef OutIt  iterator_type;
 
-  Transform_output_iterator(OutIt *o, const & F f = F()) : _o(o), _f(f) {}
+  Transform_output_iterator(OutIt *o, const F & f = F()) : _o(o), _f(f) {}
 
   template <typename T>
   Transform_output_iterator&
   operator=(const T& t)
   {
-    *(*o)++ = _f(t);
+    *(*_o)++ = _f(t);
     return *this;
   }
 
diff --git a/STL_Extension/test/STL_Extension/makefile b/STL_Extension/test/STL_Extension/makefile
index 70ce64d34f6..197ea6196e9 100644
--- a/STL_Extension/test/STL_Extension/makefile
+++ b/STL_Extension/test/STL_Extension/makefile
@@ -20,7 +20,7 @@ CXXFLAGS = \
            $(EXTRA_FLAGS) \
            $(CGAL_CXXFLAGS) \
            $(LONG_NAME_PROBLEM_CXXFLAGS) \
-           $(DEBUG_OPT) -U_GLIBCXX_DEBUG
+           $(DEBUG_OPT)
 
 #---------------------------------------------------------------------#
 #                    linker flags