diff --git a/include/mapnik/image_scaling.hpp b/include/mapnik/image_scaling.hpp
index 2f156fb73..3fd0bcef9 100644
--- a/include/mapnik/image_scaling.hpp
+++ b/include/mapnik/image_scaling.hpp
@@ -69,6 +69,20 @@ MAPNIK_DECL void scale_image_agg(T & target, T const& source,
                                  double y_off_f,
                                  double filter_factor,
                                  boost::optional<double> const & nodata_value);
+template <typename T>
+MAPNIK_DECL void scale_image_agg(T & target, T const& source,
+                                 scaling_method_e scaling_method,
+                                 double image_ratio_x,
+                                 double image_ratio_y,
+                                 double x_off_f,
+                                 double y_off_f,
+                                 double filter_factor)
+{
+    scale_image_agg(target, source, scaling_method,
+                    image_ratio_x,image_ratio_y,
+                    x_off_f, y_off_f, filter_factor,
+                    boost::optional<double>());
+}
 }
 
 #endif // MAPNIK_IMAGE_SCALING_HPP
diff --git a/include/mapnik/warp.hpp b/include/mapnik/warp.hpp
index 6d314977a..abf010851 100644
--- a/include/mapnik/warp.hpp
+++ b/include/mapnik/warp.hpp
@@ -38,8 +38,14 @@ MAPNIK_DECL void reproject_and_scale_raster(raster & target,
                                             proj_transform const& prj_trans,
                                             double offset_x, double offset_y,
                                             unsigned mesh_size,
-                                            scaling_method_e scaling_method);
+                                            scaling_method_e scaling_method,
+                                            boost::optional<double> const & nodata_value);
 
+MAPNIK_DECL void reproject_and_scale_raster(raster & target, raster const& source,
+                                            proj_transform const& prj_trans,
+                                            double offset_x, double offset_y,
+                                            unsigned mesh_size,
+                                            scaling_method_e scaling_method);
 
 template <typename T>
 MAPNIK_DECL void warp_image (T & target, T const& source, proj_transform const& prj_trans,
diff --git a/src/map.cpp b/src/map.cpp
index 81ad147c5..c44735ce4 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -580,7 +580,7 @@ void Map::zoom_all()
 
 void Map::zoom_to_box(box2d<double> const& box)
 {
-    current_extent_=box;
+    current_extent_= box;
     fixAspectRatio();
 }
 
diff --git a/src/warp.cpp b/src/warp.cpp
index 49085a0fb..b250d6e39 100644
--- a/src/warp.cpp
+++ b/src/warp.cpp
@@ -221,6 +221,20 @@ void reproject_and_scale_raster(raster & target, raster const& source,
     util::apply_visitor(warper, source.data_);
 }
 
+void reproject_and_scale_raster(raster & target, raster const& source,
+                                            proj_transform const& prj_trans,
+                                            double offset_x, double offset_y,
+                                            unsigned mesh_size,
+                                            scaling_method_e scaling_method)
+{
+    reproject_and_scale_raster(target, source, prj_trans,
+                               offset_x, offset_y,
+                               mesh_size,
+                               scaling_method,
+                               boost::optional<double>());
+}
+
+
 template MAPNIK_DECL void warp_image (image_rgba8&, image_rgba8 const&, proj_transform const&,
                                       box2d<double> const&, box2d<double> const&, double, double, unsigned, scaling_method_e, double, boost::optional<double> const &);