diff --git a/include/mapnik/renderer_common/process_polygon_symbolizer.hpp b/include/mapnik/renderer_common/process_polygon_symbolizer.hpp
index be5526957..c3756a7a0 100644
--- a/include/mapnik/renderer_common/process_polygon_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_polygon_symbolizer.hpp
@@ -36,7 +36,7 @@ void render_polygon_symbolizer(polygon_symbolizer const &sym,
 {
     agg::trans_affine tr;
     auto transform = get_optional<transform_type>(sym, keys::geometry_transform);
-    if (transform) evaluate_transform(tr, feature, *transform);
+    if (transform) evaluate_transform(tr, feature, *transform, common.scale_factor_);
 
     bool clip = get<value_bool>(sym, keys::clip, feature, true);
     double simplify_tolerance = get<double>(sym, keys::simplify_tolerance, feature, 0.0);
diff --git a/include/mapnik/renderer_common/process_raster_symbolizer.hpp b/include/mapnik/renderer_common/process_raster_symbolizer.hpp
index a4764abbb..dae91ecae 100644
--- a/include/mapnik/renderer_common/process_raster_symbolizer.hpp
+++ b/include/mapnik/renderer_common/process_raster_symbolizer.hpp
@@ -24,9 +24,6 @@
 #define MAPNIK_RENDERER_COMMON_PROCESS_RASTER_SYMBOLIZER_HPP
 
 // agg
-#include "agg_conv_clip_polyline.h"
-#include "agg_conv_clip_polygon.h"
-#include "agg_conv_smooth_poly1.h"
 #include "agg_rendering_buffer.h"
 #include "agg_pixfmt_rgba.h"
 
diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp
index d545bb1e4..6bace422b 100644
--- a/src/agg/agg_renderer.cpp
+++ b/src/agg/agg_renderer.cpp
@@ -217,7 +217,6 @@ void agg_renderer<T0,T1>::start_style_processing(feature_type_style const& st)
     {
         if (st.image_filters_inflate())
         {
-            std::clog << "inflate " << common_.t_.offset() << "\n";
             int radius = 0;
             mapnik::filter::filter_radius_visitor visitor(radius);
             for(mapnik::filter::filter_type const& filter_tag : st.image_filters())
@@ -228,7 +227,6 @@ void agg_renderer<T0,T1>::start_style_processing(feature_type_style const& st)
             {
                 common_.t_.set_offset(radius);
             }
-            std::clog << "inflate " << common_.t_.offset() << "\n";
             int offset = common_.t_.offset();
             unsigned target_width = common_.width_ + (offset * 2);
             unsigned target_height = common_.height_ + (offset * 2);
@@ -254,7 +252,6 @@ void agg_renderer<T0,T1>::start_style_processing(feature_type_style const& st)
             {
                 internal_buffer_->set_background(color(0,0,0,0)); // fill with transparent colour
             }
-            std::clog << "inflate " << common_.t_.offset() << "\n";
             common_.t_.set_offset(0);
             ras_ptr->clip_box(0,0,common_.width_,common_.height_);
         }