diff --git a/automation/System/Self_heal.yaml b/automation/System/Self_heal.yaml
index 11b4c4fc..cadd6422 100755
--- a/automation/System/Self_heal.yaml
+++ b/automation/System/Self_heal.yaml
@@ -9,7 +9,7 @@
     platform: time
     at: '2:31:00'
   action:
-    - service: zwave.heal_network
+#    - service: zwave.heal_network - Not needed anymore since I've migrated to Wink.
 
     - service: script.tweet_engine
       data_template:
diff --git a/automation/dash_buttons.yaml b/automation/dash_buttons.yaml
index fe1f3ae7..f1487a90 100755
--- a/automation/dash_buttons.yaml
+++ b/automation/dash_buttons.yaml
@@ -19,3 +19,4 @@
         minutes: 1
     # enable this automation - This prevents duplicate pushes.
     - service: automation.turn_on
+      entity_id: automation.toggle_office_light_onoff
diff --git a/automation/medicine_logger.yaml b/automation/medicine_logger.yaml
index 3879223f..1b4c97da 100755
--- a/automation/medicine_logger.yaml
+++ b/automation/medicine_logger.yaml
@@ -34,3 +34,4 @@
     - delay:
         minutes: 1
     - service: automation.turn_on
+      entity_id: automation.log_medicine_activity
\ No newline at end of file
diff --git a/packages/skybellhd.yaml b/packages/skybellhd.yaml
index ac8669dd..7789ce6d 100755
--- a/packages/skybellhd.yaml
+++ b/packages/skybellhd.yaml
@@ -71,12 +71,13 @@ automation:
          entity_id:
            - binary_sensor.skybell_stone_door_button
          to: 'on'
-       - platform: event
-         event_type: skybell_pressed
+       # - platform: event
+       #   event_type: skybell_pressed
 
     action:
       # Disable this automation
       - service: automation.turn_off
+        entity_id: automation.log_skybell_pressed_activity
       - service: script.skybell_pressed
       - delay:
           minutes: 1
diff --git a/packages/twitter.yaml b/packages/twitter.yaml
index 703c4410..538d2a4a 100755
--- a/packages/twitter.yaml
+++ b/packages/twitter.yaml
@@ -120,6 +120,7 @@ automation:
 
     action:
       - service: automation.turn_off
+        entity_id: automation.random_house_stats
       - delay: '0{{ range(0,2) | random | int }}:{{ range(10,59) | random | int }}:00'
       - service: script.tweet_engine
         data_template:
@@ -144,3 +145,5 @@ automation:
             "Average Cloud Coverage: {{states.sensor.dark_sky_cloud_coverage.state}}%, Average Temp: {{states.sensor.dark_sky_temperature.state}}°F #Solar"
             ] | random + " #RandomStat"}}
       - service: automation.turn_on
+        entity_id: automation.random_house_stats
+
diff --git a/www/custom_ui/floorplan/clock.yaml b/www/custom_ui/floorplan/clock.yaml
index 677ca7ac..b8dab5df 100755
--- a/www/custom_ui/floorplan/clock.yaml
+++ b/www/custom_ui/floorplan/clock.yaml
@@ -9,7 +9,7 @@ variables:
 defaults:
   hover_over: false
   more_info: false
-  
+
 rules:
 
   - element: floorplan.clock_button
@@ -19,7 +19,7 @@ rules:
         page_id: clock_config
 
   - entity: sensor.clock_stacey_alarm_time
-    text_template: '${entity.state.slice(0, 5)}'
+    text_template: '${entity.state ? entity.state.slice(0, 5) : "00:00"}'
 
 
   - entity: input_boolean.clock_snooze
diff --git a/www/custom_ui/floorplan/clock_config.yaml b/www/custom_ui/floorplan/clock_config.yaml
index 044c7716..f84e7db5 100755
--- a/www/custom_ui/floorplan/clock_config.yaml
+++ b/www/custom_ui/floorplan/clock_config.yaml
@@ -15,11 +15,11 @@ startup:
     - service: floorplan.variable_set
       data:
         variable: floorplan.hours
-        value_template: 'return parseInt(entities["sensor.clock_stacey_alarm_time"].state.slice(0, 2));'
+        value_template: '${parseInt(entities["sensor.clock_stacey_alarm_time"].state.slice(0, 2)) ? parseInt(entities["sensor.clock_stacey_alarm_time"].state.slice(0, 2)): "00"}'
     - service: floorplan.variable_set
       data:
         variable: floorplan.minutes
-        value_template: 'return parseInt(entities["sensor.clock_stacey_alarm_time"].state.slice(3, 5));'
+        value_template: '${parseInt(entities["sensor.clock_stacey_alarm_time"].state.slice(3, 5)) ? parseInt(entities["sensor.clock_stacey_alarm_time"].state.slice(3, 5)): "00"}'
 
 rules:
 
@@ -30,7 +30,7 @@ rules:
         page_id: clock
 
   - entity: sensor.clock_stacey_alarm_time
-    text_template: '${entity.state.slice(0, 5)}'
+    text_template: '${entity.state ? entity.state.slice(0, 5) : "00:00"}'
 
   - entities:
     -  floorplan.hours
@@ -73,7 +73,7 @@ rules:
     action:
       service: mqtt.publish
       data_template: '{
-        "payload": "${("0"+ entities[`floorplan.hours`].state).slice(-2)}:${("0" + entities[`floorplan.minutes`].state).slice(-2)}",
+        "payload": "${(("0" + (parseInt((entities[`floorplan.hours`].state).slice(-2)) + 24) % 24)).slice(-2)}:${("0" + (((parseInt(entities[`floorplan.minutes`].state) / 5) * 5) % 60)).slice(-2)}",
         "topic": "clock/stacey_alarm_time",
         "retain": true
       }'