diff --git a/automation/away.yaml b/automation/away.yaml
index 9a81e293..d535f2ee 100755
--- a/automation/away.yaml
+++ b/automation/away.yaml
@@ -6,7 +6,7 @@
   trigger:
     - platform: state
       entity_id: binary_sensor.downstairs_away_mode
-      to: 'on'
+      to: 'True'
     - platform: state
       entity_id: group.family
       to: 'not_home'
diff --git a/automation/late_night_helper.yaml b/automation/late_night_helper.yaml
index fc3be58d..29c7f557 100755
--- a/automation/late_night_helper.yaml
+++ b/automation/late_night_helper.yaml
@@ -8,7 +8,7 @@
     - platform: state
       entity_id:
         - binary_sensor.downstairs_away_mode
-      to: 'off'
+      to: 'False'
     - platform: state
       entity_id: group.family
       to: home
diff --git a/automation/upstairs_motion_ifttt.yaml b/automation/upstairs_motion_ifttt.yaml
index 27ca2c63..f7587e91 100755
--- a/automation/upstairs_motion_ifttt.yaml
+++ b/automation/upstairs_motion_ifttt.yaml
@@ -6,7 +6,7 @@
       event_type: upstairs_light_on
     - platform: state
       entity_id: binary_sensor.upstairs_away_mode
-      to: 'off'
+      to: 'False'
 
   condition:
     - condition: state
@@ -25,7 +25,7 @@
       event_type: upstairs_light_off
     - platform: state
       entity_id: binary_sensor.upstairs_away_mode
-      to: 'on'
+      to: 'True'
 
   action:
     service: light.turn_off
diff --git a/packages/skybellhd.yaml b/packages/skybellhd.yaml
index b7f0484e..597930cc 100755
--- a/packages/skybellhd.yaml
+++ b/packages/skybellhd.yaml
@@ -9,7 +9,7 @@ homeassistant:
   customize_glob:
     "sensor.skybell_*":
       icon: mdi:camera-front
-      
+
       hidden: False
       homebridge_hidden: True
 
@@ -50,7 +50,6 @@ sensor:
   - platform: template
     sensors:
        skybell:
-         entity_id: binary_sensor.skybell_stone_door_button
          value_template: "{{ 'Online' if is_state_attr('binary_sensor.skybell_stone_door_button', 'status', 'up') else 'Offline' }}"
 
 switch:
diff --git a/sensor/nest.yaml b/sensor/nest.yaml
index 78b9f13f..822ad0d6 100755
--- a/sensor/nest.yaml
+++ b/sensor/nest.yaml
@@ -17,11 +17,9 @@
 - platform: template
   sensors:
      upstairs_away_mode:
-       entity_id: climate.upstairs
        value_template: "{{ is_state_attr('climate.upstairs', 'away_mode', 'on') }}"
 
 - platform: template
   sensors:
      downstairs_away_mode:
-       entity_id: climate.downstairs
        value_template: "{{ is_state_attr('climate.downstairs', 'away_mode', 'on') }}"