diff --git a/agg/include/agg_rasterizer_cells_aa.h b/agg/include/agg_rasterizer_cells_aa.h
index f073153ba..4e1c62a7d 100755
--- a/agg/include/agg_rasterizer_cells_aa.h
+++ b/agg/include/agg_rasterizer_cells_aa.h
@@ -30,7 +30,8 @@
 #define AGG_RASTERIZER_CELLS_AA_INCLUDED
 
 #include <string.h>
-#include <math.h>
+#include <cstdlib>
+#include <limits>
 #include "agg_math.h"
 #include "agg_array.h"
 
@@ -325,8 +326,8 @@ namespace agg
             int cy = (y1 + y2) >> 1;
 
             // Bail if values are so large they are likely to wrap
-            if ((abs(x1) >= INT_MAX/2) || (abs(y1) >= INT_MAX/2) ||
-                (abs(x2) >= INT_MAX/2) || (abs(y2) >= INT_MAX/2))
+            if ((std::abs(x1) >= std::numeric_limits<int>::max()/2) || (std::abs(y1) >= std::numeric_limits<int>::max()/2) ||
+                (std::abs(x2) >= std::numeric_limits<int>::max()/2) || (std::abs(y2) >= std::numeric_limits<int>::max()/2))
                     return;
 
             line(x1, y1, cx, cy);
diff --git a/include/mapnik/svg/agg_svg_path_renderer.h b/include/mapnik/svg/agg_svg_path_renderer.h
index 265226d08..742cfe7b2 100644
--- a/include/mapnik/svg/agg_svg_path_renderer.h
+++ b/include/mapnik/svg/agg_svg_path_renderer.h
@@ -165,7 +165,7 @@ namespace svg
         void curve4(double x2, double y2,                   // S, s
                     double x,  double y, bool rel=false);
 	
-	void arc_to(double rx, double rx,                   // A, a
+	void arc_to(double rx, double ry,                   // A, a
 		    double angle, 
 		    bool large_arc_flag,
 		    bool sweep_flag,