diff --git a/benchmark/run.cpp b/benchmark/run.cpp
index 4bc35d6ad..b1b3a8dde 100644
--- a/benchmark/run.cpp
+++ b/benchmark/run.cpp
@@ -356,7 +356,7 @@ struct test7
     }
     void operator()()
     {
-         for (int i=0;i<iter_;++i) {
+         for (unsigned i=0;i<iter_;++i) {
              mapnik::expression_ptr expr = mapnik::parse_expression(expr_,"utf-8");
          }
     }
@@ -386,7 +386,7 @@ struct test8
     void operator()()
     {
          mapnik::expression_grammar<std::string::const_iterator> expr_grammar(transcoder("utf-8"));
-         for (int i=0;i<iter_;++i) {
+         for (unsigned i=0;i<iter_;++i) {
              mapnik::expression_ptr expr = mapnik::parse_expression(expr_,expr_grammar);
          }
     }
diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp
index 7a172f5b0..b669f58ce 100644
--- a/include/mapnik/vertex_converters.hpp
+++ b/include/mapnik/vertex_converters.hpp
@@ -55,6 +55,7 @@
 // agg
 #include "agg_conv_clip_polygon.h"
 #include "agg_conv_clip_polyline.h"
+#include "agg_conv_close_polygon.h"
 #include "agg_conv_smooth_poly1.h"
 #include "agg_conv_stroke.h"
 #include "agg_conv_dash.h"
@@ -68,6 +69,7 @@ struct transform_tag {};
 struct clip_line_tag {};
 struct clip_poly_tag {};
 struct clipper_tag {};
+struct close_poly_tag {};
 struct smooth_tag {};
 struct simplify_tag {};
 struct stroke_tag {};
@@ -196,7 +198,7 @@ struct converter_traits<T,mapnik::clipper_tag>
     static void setup(geometry_type & geom, Args const& args)
     {
         typename boost::mpl::at<Args,boost::mpl::int_<0> >::type box = boost::fusion::at_c<0>(args);
-        agg::path_storage * ps = new agg::path_storage(); // this will leak memory!
+        agg::path_storage * ps = new agg::path_storage(); // FIXME: this will leak memory!
         ps->move_to(box.minx(),box.miny());
         ps->line_to(box.minx(),box.maxy());
         ps->line_to(box.maxx(),box.maxy());
@@ -207,6 +209,17 @@ struct converter_traits<T,mapnik::clipper_tag>
     }
 };
 
+template <typename T>
+struct converter_traits<T,mapnik::close_poly_tag>
+{
+    typedef T geometry_type;
+    typedef typename agg::conv_close_polygon<geometry_type> conv_type;
+    template <typename Args>
+    static void setup(geometry_type & geom, Args const& args)
+    {
+        // no-op
+    }
+};
 
 template <typename T>
 struct converter_traits<T,mapnik::transform_tag>