diff --git a/changelog b/changelog
index f9a0ae12..798daa2c 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
 aarlo
+0.8.1.1
+  Fix some deprecated warnings.
 0.8.1
   Move out of beta. It has been long enough...
 0.8.1b15
diff --git a/custom_components/aarlo/__init__.py b/custom_components/aarlo/__init__.py
index 5336d3cf..6d15cd8d 100644
--- a/custom_components/aarlo/__init__.py
+++ b/custom_components/aarlo/__init__.py
@@ -53,7 +53,7 @@
 from .cfg import BlendedCfg, PyaarloCfg
 
 
-__version__ = "0.8.1"
+__version__ = "0.8.1.1"
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/custom_components/aarlo/alarm_control_panel.py b/custom_components/aarlo/alarm_control_panel.py
index 4a95dd1e..165c2fbf 100644
--- a/custom_components/aarlo/alarm_control_panel.py
+++ b/custom_components/aarlo/alarm_control_panel.py
@@ -32,13 +32,12 @@
     STATE_ALARM_DISARMED,
     STATE_ALARM_TRIGGERED,
 )
-from homeassistant.core import callback, HassJob
+from homeassistant.core import HomeAssistant, HassJob
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA
 from homeassistant.helpers.event import async_track_point_in_time
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
 
 from pyaarlo.constant import (
     MODE_KEY,
@@ -100,7 +99,7 @@
 
 
 async def async_setup_entry(
-        hass: HomeAssistantType,
+        hass: HomeAssistant,
         _entry: ConfigEntry,
         async_add_entities: Callable[[list], None],
 ) -> None:
@@ -154,11 +153,11 @@ async def async_service_callback(call):
 
     # Websockets.
     if base_stations_with_sirens:
-        hass.components.websocket_api.async_register_command(
-            WS_TYPE_SIREN_ON, websocket_siren_on, SCHEMA_WS_SIREN_ON
+        websocket_api.async_register_command(
+            hass, WS_TYPE_SIREN_ON, websocket_siren_on, SCHEMA_WS_SIREN_ON
         )
-        hass.components.websocket_api.async_register_command(
-            WS_TYPE_SIREN_OFF, websocket_siren_off, SCHEMA_WS_SIREN_OFF
+        websocket_api.async_register_command(
+            hass, WS_TYPE_SIREN_OFF, websocket_siren_off, SCHEMA_WS_SIREN_OFF
         )
 
 
diff --git a/custom_components/aarlo/binary_sensor.py b/custom_components/aarlo/binary_sensor.py
index c31677ac..2c5287f3 100644
--- a/custom_components/aarlo/binary_sensor.py
+++ b/custom_components/aarlo/binary_sensor.py
@@ -17,11 +17,10 @@
     DOMAIN as BINARY_SENSOR_DOMAIN
 )
 from homeassistant.const import ATTR_ATTRIBUTION, CONF_MONITORED_CONDITIONS
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
 
 from pyaarlo.constant import (
     ALS_STATE_KEY,
@@ -82,7 +81,7 @@
 
 
 async def async_setup_entry(
-        hass: HomeAssistantType,
+        hass: HomeAssistant,
         _entry: ConfigEntry,
         async_add_entities: Callable[[list], None],
 ) -> None:
diff --git a/custom_components/aarlo/camera.py b/custom_components/aarlo/camera.py
index 78d0db13..5d933dc2 100644
--- a/custom_components/aarlo/camera.py
+++ b/custom_components/aarlo/camera.py
@@ -37,13 +37,12 @@
     CONF_FILENAME,
     STATE_ALARM_DISARMED
 )
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
 
 import pyaarlo
 from pyaarlo.constant import (
@@ -184,7 +183,7 @@
 
 
 async def async_setup_entry(
-        hass: HomeAssistantType,
+        hass: HomeAssistant,
         _entry: ConfigEntry,
         async_add_entities: Callable[[list], None],
 ) -> None:
@@ -263,33 +262,33 @@ async def async_service_callback(call):
         )
 
     # Websockets
-    hass.components.websocket_api.async_register_command(
-        WS_TYPE_VIDEO_URL, websocket_video_url, SCHEMA_WS_VIDEO_URL
+    websocket_api.async_register_command(
+        hass, WS_TYPE_VIDEO_URL, websocket_video_url, SCHEMA_WS_VIDEO_URL
     )
-    hass.components.websocket_api.async_register_command(
-        WS_TYPE_LIBRARY, websocket_library, SCHEMA_WS_LIBRARY
+    websocket_api.async_register_command(
+        hass, WS_TYPE_LIBRARY, websocket_library, SCHEMA_WS_LIBRARY
     )
-    hass.components.websocket_api.async_register_command(
-        WS_TYPE_STREAM_URL, websocket_stream_url, SCHEMA_WS_STREAM_URL
+    websocket_api.async_register_command(
+        hass, WS_TYPE_STREAM_URL, websocket_stream_url, SCHEMA_WS_STREAM_URL
     )
-    hass.components.websocket_api.async_register_command(
-        WS_TYPE_SNAPSHOT_IMAGE, websocket_snapshot_image, SCHEMA_WS_SNAPSHOT_IMAGE
+    websocket_api.async_register_command(
+        hass, WS_TYPE_SNAPSHOT_IMAGE, websocket_snapshot_image, SCHEMA_WS_SNAPSHOT_IMAGE
     )
-    hass.components.websocket_api.async_register_command(
-        WS_TYPE_REQUEST_SNAPSHOT, websocket_request_snapshot, SCHEMA_WS_REQUEST_SNAPSHOT
+    websocket_api.async_register_command(
+        hass, WS_TYPE_REQUEST_SNAPSHOT, websocket_request_snapshot, SCHEMA_WS_REQUEST_SNAPSHOT
     )
-    hass.components.websocket_api.async_register_command(
-        WS_TYPE_VIDEO_DATA, websocket_video_data, SCHEMA_WS_VIDEO_DATA
+    websocket_api.async_register_command(
+        hass, WS_TYPE_VIDEO_DATA, websocket_video_data, SCHEMA_WS_VIDEO_DATA
     )
-    hass.components.websocket_api.async_register_command(
-        WS_TYPE_STOP_ACTIVITY, websocket_stop_activity, SCHEMA_WS_STOP_ACTIVITY
+    websocket_api.async_register_command(
+        hass, WS_TYPE_STOP_ACTIVITY, websocket_stop_activity, SCHEMA_WS_STOP_ACTIVITY
     )
     if cameras_with_siren:
-        hass.components.websocket_api.async_register_command(
-            WS_TYPE_SIREN_ON, websocket_siren_on, SCHEMA_WS_SIREN_ON
+        websocket_api.async_register_command(
+            hass, WS_TYPE_SIREN_ON, websocket_siren_on, SCHEMA_WS_SIREN_ON
         )
-        hass.components.websocket_api.async_register_command(
-            WS_TYPE_SIREN_OFF, websocket_siren_off, SCHEMA_WS_SIREN_OFF
+        websocket_api.async_register_command(
+            hass, WS_TYPE_SIREN_OFF, websocket_siren_off, SCHEMA_WS_SIREN_OFF
         )
 
 
diff --git a/custom_components/aarlo/light.py b/custom_components/aarlo/light.py
index 05d0528c..a47da2f6 100644
--- a/custom_components/aarlo/light.py
+++ b/custom_components/aarlo/light.py
@@ -26,10 +26,9 @@
     ATTR_BATTERY_CHARGING,
     ATTR_BATTERY_LEVEL,
 )
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
 
 from pyaarlo.constant import (
     BRIGHTNESS_KEY,
@@ -64,7 +63,7 @@
 
 
 async def async_setup_entry(
-        hass: HomeAssistantType,
+        hass: HomeAssistant,
         _entry: ConfigEntry,
         async_add_entities: Callable[[list], None],
 ) -> None:
diff --git a/custom_components/aarlo/manifest.json b/custom_components/aarlo/manifest.json
index 56442846..e030f585 100644
--- a/custom_components/aarlo/manifest.json
+++ b/custom_components/aarlo/manifest.json
@@ -15,5 +15,5 @@
     "unidecode",
     "pyaarlo>=0.8.0.6"
   ],
-  "version": "0.8.1"
+  "version": "0.8.1.1"
 }
diff --git a/custom_components/aarlo/media_player.py b/custom_components/aarlo/media_player.py
index e4c01286..ab804de9 100644
--- a/custom_components/aarlo/media_player.py
+++ b/custom_components/aarlo/media_player.py
@@ -23,10 +23,9 @@
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
 )
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
 
 from pyaarlo.constant import MEDIA_PLAYER_KEY
 
@@ -67,7 +66,7 @@
 
 
 async def async_setup_entry(
-        hass: HomeAssistantType,
+        hass: HomeAssistant,
         _entry: ConfigEntry,
         async_add_entities: Callable[[list], None],
 ) -> None:
diff --git a/custom_components/aarlo/sensor.py b/custom_components/aarlo/sensor.py
index d3919cdb..4031e8d1 100644
--- a/custom_components/aarlo/sensor.py
+++ b/custom_components/aarlo/sensor.py
@@ -16,7 +16,7 @@
     CONF_MONITORED_CONDITIONS,
     UnitOfTemperature,
 )
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import Entity
 from homeassistant.components.sensor import (
@@ -25,7 +25,6 @@
 )
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.util import slugify
 
 from pyaarlo.constant import (
@@ -88,7 +87,7 @@
 
 
 async def async_setup_entry(
-        hass: HomeAssistantType,
+        hass: HomeAssistant,
         _entry: ConfigEntry,
         async_add_entities: Callable[[list], None],
 ) -> None:
diff --git a/custom_components/aarlo/siren.py b/custom_components/aarlo/siren.py
index adfd7252..089e1c7e 100644
--- a/custom_components/aarlo/siren.py
+++ b/custom_components/aarlo/siren.py
@@ -16,10 +16,9 @@
 from homeassistant.components.siren.const import (
     SirenEntityFeature
 )
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.util import slugify
 
 from pyaarlo.constant import (
@@ -36,7 +35,7 @@
 
 
 async def async_setup_entry(
-        hass: HomeAssistantType,
+        hass: HomeAssistant,
         _entry: ConfigEntry,
         async_add_entities: Callable[[list], None],
 ) -> None:
diff --git a/custom_components/aarlo/switch.py b/custom_components/aarlo/switch.py
index 93960a15..73821164 100644
--- a/custom_components/aarlo/switch.py
+++ b/custom_components/aarlo/switch.py
@@ -20,12 +20,11 @@
     SwitchEntity
 )
 from homeassistant.const import ATTR_ATTRIBUTION
-from homeassistant.core import callback, HassJob
+from homeassistant.core import HomeAssistant, HassJob
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA
 from homeassistant.helpers.event import async_track_point_in_time
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.util import slugify
 
 from pyaarlo.constant import (
@@ -61,7 +60,7 @@
 
 
 async def async_setup_entry(
-        hass: HomeAssistantType,
+        hass: HomeAssistant,
         _entry: ConfigEntry,
         async_add_entities: Callable[[list], None]
 ) -> None: