diff --git a/include/mapnik/memory_datasource.hpp b/include/mapnik/memory_datasource.hpp
index 35a172f22..b39302680 100644
--- a/include/mapnik/memory_datasource.hpp
+++ b/include/mapnik/memory_datasource.hpp
@@ -40,7 +40,7 @@ public:
     virtual ~memory_datasource();
     void push(feature_ptr feature);
     datasource::datasource_t type() const;
-    featureset_ptr features(const query& q) const;
+    featureset_ptr features(query const& q) const;
     featureset_ptr features_at_point(coord2d const& pt, double tol = 0) const;
     box2d<double> envelope() const;
     boost::optional<geometry_t> get_geometry_type() const;
diff --git a/src/image_scaling.cpp b/src/image_scaling.cpp
index 045edda90..200c55c05 100644
--- a/src/image_scaling.cpp
+++ b/src/image_scaling.cpp
@@ -23,7 +23,8 @@
 // mapnik
 #include <mapnik/image_data.hpp>
 #include <mapnik/image_scaling.hpp>
-#include <mapnik/span_image_filter.hpp>
+// does not handle alpha correctly
+//#include <mapnik/span_image_filter.hpp>
 
 // boost
 #include <boost/assign/list_of.hpp>
@@ -352,15 +353,16 @@ void scale_image_agg(Image & target,
     // http://old.nabble.com/Re%3A-Newbie---texture-p5057255.html
 
     // high quality resampler
-    //typedef agg::span_image_resample_rgba_affine<img_src_type> span_gen_type;
+    typedef agg::span_image_resample_rgba_affine<img_src_type> span_gen_type;
 
     // faster, lower quality
     //typedef agg::span_image_filter_rgba<img_src_type,interpolator_type> span_gen_type;
 
     // local, modified agg::span_image_resample_rgba_affine
-    // not convinced we need this
+    // dating back to when we were not handling alpha correctly
+    // and this file helped work around symptoms
     // https://github.com/mapnik/mapnik/issues/1489
-    typedef mapnik::span_image_resample_rgba_affine<img_src_type> span_gen_type;
+    //typedef mapnik::span_image_resample_rgba_affine<img_src_type> span_gen_type;
     span_gen_type sg(img_src, interpolator, filter);
     agg::render_scanlines_aa(ras, sl, rb_dst_pre, sa, sg);
 }
diff --git a/src/warp.cpp b/src/warp.cpp
index 6fc22da4a..c40953053 100644
--- a/src/warp.cpp
+++ b/src/warp.cpp
@@ -27,7 +27,6 @@
 #include <mapnik/image_util.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/ctrans.hpp>
-#include <mapnik/span_image_filter.hpp>
 #include <mapnik/raster.hpp>
 #include <mapnik/proj_transform.hpp>
 
@@ -188,7 +187,7 @@ void reproject_and_scale_raster(raster & target, raster const& source,
                     agg::render_scanlines_aa(rasterizer, scanline, rb_pre,
                                              sa, sg);
                 } else {
-                    typedef mapnik::span_image_resample_rgba_affine
+                    typedef agg::span_image_resample_rgba_affine
                         <img_accessor_type> span_gen_type;
                     span_gen_type sg(ia, interpolator, filter);
                     agg::render_scanlines_aa(rasterizer, scanline, rb_pre,
diff --git a/tests/visual_tests/images/tiff-resampling-600-reference.png b/tests/visual_tests/images/tiff-resampling-600-reference.png
index 523ed9a99..a355ac3d5 100644
Binary files a/tests/visual_tests/images/tiff-resampling-600-reference.png and b/tests/visual_tests/images/tiff-resampling-600-reference.png differ