diff --git a/custom_components/nodered/binary_sensor.py b/custom_components/nodered/binary_sensor.py
index c092ea8..3c90621 100644
--- a/custom_components/nodered/binary_sensor.py
+++ b/custom_components/nodered/binary_sensor.py
@@ -46,7 +46,7 @@ class NodeRedBinarySensor(NodeRedEntity, BinarySensorEntity):
         STATE_ON,
         STATE_OPEN,
         STATE_HOME,
-        STATE_UNLOCKED,
+        LockState.UNLOCKED,
     )
     _component = CONF_BINARY_SENSOR
 
diff --git a/custom_components/nodered/switch.py b/custom_components/nodered/switch.py
index 3bc9f95..496e527 100644
--- a/custom_components/nodered/switch.py
+++ b/custom_components/nodered/switch.py
@@ -31,13 +31,11 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-SERVICE_TRIGGER_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_ENTITY_ID): cv.entity_ids,
-        vol.Optional(CONF_OUTPUT_PATH, default="0"): cv.string,
-        vol.Optional(CONF_MESSAGE, default={}): dict,
-    }
-)
+SERVICE_TRIGGER_SCHEMA = {
+    vol.Required(CONF_ENTITY_ID): cv.entity_ids,
+    vol.Optional(CONF_OUTPUT_PATH, default="0"): cv.string,
+    vol.Optional(CONF_MESSAGE, default={}): dict,
+}
 EVENT_TRIGGER_NODE = "automation_triggered"
 EVENT_DEVICE_TRIGGER = "device_trigger"