diff --git a/config/automation/Timed_Triggers/night_watchdog.yaml b/config/automation/Timed_Triggers/night_watchdog.yaml
index 05174443..85bd0c82 100755
--- a/config/automation/Timed_Triggers/night_watchdog.yaml
+++ b/config/automation/Timed_Triggers/night_watchdog.yaml
@@ -59,6 +59,8 @@
 
 - alias: 'Bedroom Screensaver Watchdog'
   id: Bedroom-Screensaver-Watchdog-automation
+  mode: single
+  max_exceeded: silent
   trigger:
     - platform: state 
       entity_id: binary_sensor.sleepnumber_carlo_carlo_is_in_bed
@@ -79,6 +81,9 @@
         - condition: state
           entity_id: binary_sensor.sleepnumber_carlo_stacey_is_in_bed
           state: 'on'
+    - condition: state
+      entity_id: switch.alarm_panel_1_screensaver
+      state: 'off'
 
   action:
     - service: switch.turn_on
diff --git a/config/automation/good_night.yaml b/config/automation/good_night.yaml
index fe43fefa..c922d4eb 100755
--- a/config/automation/good_night.yaml
+++ b/config/automation/good_night.yaml
@@ -10,6 +10,8 @@
 
 - alias: 'Good Night Trigger'
   id: 26846f7b-bc76-43d2-99be-af552da7700f
+  mode: single
+  max_exceeded: silent
   trigger:
     - platform: state
       entity_id: input_boolean.good_night
@@ -69,6 +71,7 @@
 
 - alias: 'Bed Presence AMP Trigger'
   id: 26846f7b-bc76-43d2-99be-af552d2300f
+  mode: restart
   trigger:
     - platform: state
       entity_id:
@@ -84,8 +87,9 @@
     choose:
       - alias: "SomeOne in Bed"
         conditions:
-          - condition: trigger
-            id: in_bed
+          - condition: state
+            entity_id: group.bed
+            state: 'on'
         sequence:
           - service: homeassistant.turn_off
             target:
diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml
index e8570fd8..c2529368 100755
--- a/config/automation/late_night_outside_helper.yaml
+++ b/config/automation/late_night_outside_helper.yaml
@@ -11,6 +11,8 @@
 ######################################################################
 - alias: 'Late Night Helper outside'
   id: 14115d72-6bea-41c1-8411-1eaf41b4ef2b
+  mode: single
+  max_exceeded: silent
   trigger:
     - platform: state
       entity_id: group.garage_doors
diff --git a/config/automation/master_bath_accents.yaml b/config/automation/master_bath_accents.yaml
index 21f0ebe0..05d5ccf4 100755
--- a/config/automation/master_bath_accents.yaml
+++ b/config/automation/master_bath_accents.yaml
@@ -12,6 +12,8 @@
 ######################################################################
 - alias: Bedtime Accent Light
   id: 08fe7b86-7610-420a-8f4c-7adb86618900
+  mode: single
+  max_exceeded: silent
   trigger:
     - platform: state
       entity_id:
diff --git a/config/packages/landscape_lighting.yaml b/config/packages/landscape_lighting.yaml
index c78526ce..81716b9d 100755
--- a/config/packages/landscape_lighting.yaml
+++ b/config/packages/landscape_lighting.yaml
@@ -23,6 +23,7 @@ automation:
     - alias: 'Landscape lights off'
       id: 05172967-9309-4624-8633-4f8bce4f3aa1
       mode: single
+      max_exceeded: silent
       trigger:
         - platform: state
           entity_id: