diff --git a/src/components/state-history-chart-line.html b/src/components/state-history-chart-line.html
index d023617205..873d1accb4 100644
--- a/src/components/state-history-chart-line.html
+++ b/src/components/state-history-chart-line.html
@@ -6,8 +6,9 @@
 
   function range(start, end) {
     var result = [];
+    var i;
 
-    for (let i = start; i < end; i++) {
+    for (i = start; i < end; i++) {
       result.push(i);
     }
 
@@ -151,14 +152,15 @@
           // We differentiate between thermostats that have a target temperature
           // range versus ones that have just a target temperature
           hasTargetRange = states.reduce(
-            (cum, cur) => cum || cur.attributes.target_temp_high !== cur.attributes.target_temp_low,
-            false);
+            function (cum, cur) {
+              return cum || cur.attributes.target_temp_high !== cur.attributes.target_temp_low;
+            }, false);
 
-          dataTable.addColumn('number', `${name} current temperature`);
+          dataTable.addColumn('number', name + ' current temperature');
 
           if (hasTargetRange) {
-            dataTable.addColumn('number', `${name} target temperature high`);
-            dataTable.addColumn('number', `${name} target temperature low`);
+            dataTable.addColumn('number', name + ' target temperature high');
+            dataTable.addColumn('number', name + ' target temperature low');
 
             noInterpolations = [false, true, true];
 
@@ -169,7 +171,7 @@
               pushData([state.lastUpdatedAsDate, curTemp, targetHigh, targetLow], noInterpolations);
             };
           } else {
-            dataTable.addColumn('number', `${name} target temperature`);
+            dataTable.addColumn('number', name + ' target temperature');
 
             noInterpolations = [false, true];
 
diff --git a/src/components/state-history-charts.html b/src/components/state-history-charts.html
index 0df3dad2ac..e4aa90954d 100644
--- a/src/components/state-history-charts.html
+++ b/src/components/state-history-charts.html
@@ -108,7 +108,7 @@ Polymer({
       }
 
       stateWithUnit = stateInfo.find(
-        (state) => 'unit_of_measurement' in state.attributes);
+        function (state) { return 'unit_of_measurement' in state.attributes; });
 
       unit = stateWithUnit ?
         stateWithUnit.attributes.unit_of_measurement : false;
diff --git a/src/home-assistant.html b/src/home-assistant.html
index 0ead4d02ac..6e92f71a42 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.html
@@ -13,7 +13,7 @@
 <link rel='import' href='./layouts/home-assistant-main.html'>
 <link rel='import' href='./resources/home-assistant-style.html'>
 <!-- to support panels -->
-<link rel="import" href="../layouts/partial-base.html">
+<link rel="import" href="./layouts/partial-base.html">
 
 <dom-module id='home-assistant'>
   <template>
diff --git a/src/more-infos/more-info-group.html b/src/more-infos/more-info-group.html
index 85348ccc39..4247dc7264 100644
--- a/src/more-infos/more-info-group.html
+++ b/src/more-infos/more-info-group.html
@@ -42,18 +42,20 @@ Polymer({
 
     states: {
       type: Array,
-      bindNuclear: hass => [
-        hass.moreInfoGetters.currentEntity,
-        hass.entityGetters.entityMap,
-        (currentEntity, entities) => {
-          // weird bug??
-          if (!currentEntity) {
-            return [];
-          }
-          return currentEntity.attributes.entity_id.map(
-            entities.get.bind(entities));
-        },
-      ],
+      bindNuclear: function (hass) {
+        return [
+          hass.moreInfoGetters.currentEntity,
+          hass.entityGetters.entityMap,
+          function (currentEntity, entities) {
+            // weird bug??
+            if (!currentEntity) {
+              return [];
+            }
+            return currentEntity.attributes.entity_id.map(
+              entities.get.bind(entities));
+          },
+        ];
+      },
     },
   },
 
diff --git a/src/more-infos/more-info-hvac.html b/src/more-infos/more-info-hvac.html
index 628fec760f..70bb1cb905 100644
--- a/src/more-infos/more-info-hvac.html
+++ b/src/more-infos/more-info-hvac.html
@@ -217,7 +217,7 @@ Polymer({
 
     if (temperature === this.stateObj.attributes.temperature) return;
 
-    this.callServiceHelper('set_temperature', { temperature });
+    this.callServiceHelper('set_temperature', { temperature: temperature });
   },
 
   targetHumiditySliderChanged: function (ev) {
@@ -225,7 +225,7 @@ Polymer({
 
     if (humidity === this.stateObj.attributes.humidity) return;
 
-    this.callServiceHelper('set_humidity', { humidity });
+    this.callServiceHelper('set_humidity', { humidity: humidity });
   },
 
   awayToggleChanged: function (ev) {