diff --git a/ElementX/Sources/AppHooks/HealthChat/HealthChatCompoundHook.swift b/ElementX/Sources/AppHooks/HealthChat/HealthChatCompoundHook.swift
index fac80258e..154eda0fc 100644
--- a/ElementX/Sources/AppHooks/HealthChat/HealthChatCompoundHook.swift
+++ b/ElementX/Sources/AppHooks/HealthChat/HealthChatCompoundHook.swift
@@ -30,7 +30,7 @@ struct HealthChatCompoundHook: CompoundHookProtocol {
             \.borderInteractivePrimary,
             \.textBadgeAccent
         ]
-        let solidUIColorTokens: [KeyPath<CompoundUIColorTokens, UIColor>] = [
+        let solidUIColorTokens: [KeyPath<CompoundUIColorTokens, UIColor> & Sendable] = [
             \.bgActionPrimaryRest,
             \.bgAccentRest,
             \.iconAccentPrimary,
@@ -69,7 +69,7 @@ struct HealthChatCompoundHook: CompoundHookProtocol {
             \.bgBadgeAccent,
             \.borderAccentSubtle
         ]
-        let tintUIColorTokens: [KeyPath<CompoundUIColorTokens, UIColor>] = [
+        let tintUIColorTokens: [KeyPath<CompoundUIColorTokens, UIColor> & Sendable] = [
             \.bgAccentSelected,
             \.bgBadgeAccent,
             \.borderAccentSubtle
diff --git a/UnitTests/Sources/NotificationContentBuilderTests.swift b/UnitTests/Sources/NotificationContentBuilderTests.swift
index ce861fdb2..d7278a459 100644
--- a/UnitTests/Sources/NotificationContentBuilderTests.swift
+++ b/UnitTests/Sources/NotificationContentBuilderTests.swift
@@ -17,14 +17,14 @@ nonisolated struct NotificationContentBuilderTests {
     var mediaProvider: MediaProviderMock
     var notificationContent: UNMutableNotificationContent
     
-    init() {
+    init() async {
         notificationContent = .init()
         let stringBuilder = RoomMessageEventStringBuilder(attributedStringBuilder: AttributedStringBuilder(mentionBuilder: PlainMentionBuilder()),
                                                           style: .plain)
         mediaProvider = MediaProviderMock(.init())
-        notificationContentBuilder = NotificationContentBuilder(messageEventStringBuilder: stringBuilder,
-                                                                notificationSoundName: UNNotificationSoundName("message.caf"),
-                                                                userSession: NSEUserSessionMock(.init()))
+        notificationContentBuilder = await NotificationContentBuilder(messageEventStringBuilder: stringBuilder,
+                                                                      notificationSoundName: UNNotificationSoundName("message.caf"),
+                                                                      userSession: NSEUserSessionMock(.init()))
     }
     
     @Test