diff --git a/.eslintrc b/.eslintrc
index ff27be4e0..50a1eff62 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,7 +3,7 @@
         "curly": ["error", "multi-line"],
         "eol-last": ["error"],
         "indent": [
-            "error", 2,  # Blockly/Google use 2-space indents
+            "warn", 2,  # Blockly/Google use 2-space indents
             # Blockly/Google uses +4 space indents for line continuations.
             {
                 "SwitchCase": 1,
diff --git a/core/block.js b/core/block.js
index 4783c0dea..f6727ab97 100644
--- a/core/block.js
+++ b/core/block.js
@@ -1162,11 +1162,11 @@ Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign) {
     var token = tokens[i];
     if (typeof token == 'number') {
       if (token <= 0 || token > args.length) {
-        throw new Error('Block \"' + this.type + '\": ' +
+        throw new Error('Block "' + this.type + '": ' +
             'Message index %' + token + ' out of range.');
       }
       if (indexDup[token]) {
-        throw new Error('Block \"' + this.type + '\": ' +
+        throw new Error('Block "' + this.type + '": ' +
             'Message index %' + token + ' duplicated.');
       }
       indexDup[token] = true;
@@ -1180,7 +1180,7 @@ Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign) {
     }
   }
   if(indexCount != args.length) {
-    throw new Error('Block \"' + this.type + '\": ' +
+    throw new Error('Block "' + this.type + '": ' +
         'Message does not reference all ' + args.length + ' arg(s).');
   }
   // Add last dummy input if needed.
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 38990ac14..64e22d4ea 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -388,7 +388,7 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
     bottom = this.addTrashcan_(bottom);
   }
   if (this.options.zoomOptions && this.options.zoomOptions.controls) {
-    bottom = this.addZoomControls_(bottom);
+    this.addZoomControls_(bottom);
   }
 
   if (!this.isFlyout) {