diff --git a/package.json b/package.json
index 7bfd83b8e5..b712cfcdaf 100644
--- a/package.json
+++ b/package.json
@@ -25,10 +25,12 @@
     "node": ">= 0.4.0"
   },
   "dependencies": {
-    "canvas": "~1.2.1",
     "jsdom": "~3.1.2",
     "request": "~2.53.0"
   },
+  "optionalDependencies": {
+    "canvas": "~1.2.1"
+  },
   "devDependencies": {
     "uglify-js": "~2.4.16",
     "prepro": "~0.8.3"
diff --git a/src/item/Raster.js b/src/item/Raster.js
index 4f7750b7f5..d472c668f4 100644
--- a/src/item/Raster.js
+++ b/src/item/Raster.js
@@ -462,7 +462,7 @@ var Raster = Item.extend(/** @lends Raster# */{
             return src;
 /*#*/ }
         var canvas = this.getCanvas();
-        return canvas ? canvas.toDataURL() : null;
+        return canvas ? canvas.toDataURL.apply(canvas, arguments) : null;
     },
 
     /**
diff --git a/src/tool/Tool.js b/src/tool/Tool.js
index 61b04ae8c6..2a4ccc05bd 100644
--- a/src/tool/Tool.js
+++ b/src/tool/Tool.js
@@ -123,8 +123,7 @@ var Tool = PaperScopeItem.extend(/** @lends Tool# */{
     },
 
     setFixedDistance: function(distance) {
-        this._minDistance = distance;
-        this._maxDistance = distance;
+        this._minDistance = this._maxDistance = distance;
     },
 
     /**