diff --git a/basement_bathroom_sensor.yaml b/basement_bathroom_sensor.yaml
index f2eeafb..ecf3c6f 100644
--- a/basement_bathroom_sensor.yaml
+++ b/basement_bathroom_sensor.yaml
@@ -89,7 +89,15 @@ binary_sensor:
         - homeassistant.service:
             service: homeassistant.turn_off
             data:
-              entity_id: switch.basement_bathroom_light, switch.basement_shower_light, switch.basement_bathroom_heat
+              entity_id: switch.basement_bathroom_light
+        - homeassistant.service:
+            service: homeassistant.turn_off
+            data:
+              entity_id: switch.basement_shower_light
+        - homeassistant.service:
+            service: homeassistant.turn_off
+            data:
+              entity_id: switch.basement_bathroom_heater
         - if:
             condition:
               binary_sensor.is_off: trigger_humidity
@@ -97,7 +105,7 @@ binary_sensor:
               - homeassistant.service:
                   service: homeassistant.turn_off
                   data:
-                    entity_id: switch.basement_bathroom_fan
+                    entity_id: fan.basement_bathroom_fan
 
   - platform: template
     id: trigger_humidity
@@ -109,7 +117,7 @@ binary_sensor:
         - homeassistant.service:
             service: homeassistant.turn_on
             data:
-              entity_id: switch.basement_bathroom_fan
+              entity_id: fan.basement_bathroom_fan
     on_release:
       then:
         - if:
@@ -135,7 +143,7 @@ binary_sensor:
 
   - platform: homeassistant
     id: heat
-    entity_id: switch.basement_bathroom_heat
+    entity_id: switch.basement_bathroom_heater
 
 output:
   - platform: gpio