diff --git a/core/renderers/block_rendering_rewrite/block_render_draw.js b/core/renderers/block_rendering_rewrite/block_render_draw.js
index 7e784124b..02135ad36 100644
--- a/core/renderers/block_rendering_rewrite/block_render_draw.js
+++ b/core/renderers/block_rendering_rewrite/block_render_draw.js
@@ -219,7 +219,7 @@ Blockly.blockRendering.Drawer.prototype.drawStatementInput_ = function(row) {
       Blockly.blockRendering.constants.INSIDE_CORNERS.pathTop;
 
   var innerHeight =
-      row.height -(2 * Blockly.blockRendering.constants.INSIDE_CORNERS.height);
+      row.height - (2 * Blockly.blockRendering.constants.INSIDE_CORNERS.height);
 
   this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('H', x) +
       innerTopLeftCorner +
diff --git a/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js b/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
index bf397a8f9..8a6b5ba4c 100644
--- a/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
+++ b/core/renderers/block_rendering_rewrite/block_render_draw_highlight.js
@@ -134,6 +134,7 @@ Blockly.blockRendering.Highlighter.prototype.drawValueInput = function(row) {
 };
 
 Blockly.blockRendering.Highlighter.prototype.drawStatementInput = function(row) {
+  var input = row.getLastInput();
   var steps = '';
   if (this.RTL_) {
     var innerHeight = row.height - (2 * this.insideCornerPaths_.height);