diff --git a/panels/dev-state/ha-panel-dev-state.html b/panels/dev-state/ha-panel-dev-state.html
index 604981272a..59870fce18 100644
--- a/panels/dev-state/ha-panel-dev-state.html
+++ b/panels/dev-state/ha-panel-dev-state.html
@@ -149,7 +149,7 @@ Polymer({
 
   handleSetState: function () {
     var attr;
-    var attrRaw = this._stateAttributes.replace(/^\s+|\s+$/g, '')
+    var attrRaw = this._stateAttributes.replace(/^\s+|\s+$/g, '');
     try {
       attr = attrRaw ?
         JSON.parse(attrRaw) : {};
diff --git a/src/more-infos/more-info-alarm_control_panel.html b/src/more-infos/more-info-alarm_control_panel.html
index 3af69c9b23..144af4f7bb 100644
--- a/src/more-infos/more-info-alarm_control_panel.html
+++ b/src/more-infos/more-info-alarm_control_panel.html
@@ -110,7 +110,7 @@ Polymer({
       this.armHomeButtonVisible = newVal.state === 'disarmed';
       this.armAwayButtonVisible = newVal.state === 'disarmed';
     }
-    if (oldval) {
+    if (oldVal) {
       this.async(function () {
         this.fire('iron-resize');
       }.bind(this), 500);
diff --git a/src/more-infos/more-info-lock.html b/src/more-infos/more-info-lock.html
index d2d357fdfc..bfe86f05e4 100644
--- a/src/more-infos/more-info-lock.html
+++ b/src/more-infos/more-info-lock.html
@@ -47,7 +47,7 @@ Polymer({
     this.callService('lock', { code: this.enteredCode });
   },
 
-  stateObjChanged: function (newVal, oldVal) {
+  stateObjChanged: function (newVal) {
     if (newVal) {
       this.isLocked = newVal.state === 'locked';
     }