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 59ed63986..d7278a459 100644
--- a/UnitTests/Sources/NotificationContentBuilderTests.swift
+++ b/UnitTests/Sources/NotificationContentBuilderTests.swift
@@ -23,6 +23,7 @@ nonisolated struct NotificationContentBuilderTests {
                                                           style: .plain)
         mediaProvider = MediaProviderMock(.init())
         notificationContentBuilder = await NotificationContentBuilder(messageEventStringBuilder: stringBuilder,
+                                                                      notificationSoundName: UNNotificationSoundName("message.caf"),
                                                                       userSession: NSEUserSessionMock(.init()))
     }
     
@@ -225,7 +226,6 @@ nonisolated struct NotificationContentBuilderTests {
     mutating func liveLocationStartNotification() async {
         let event = TimelineEventSDKMock()
         event.eventIdReturnValue = UUID().uuidString
-        event.timestampReturnValue = 0
         event.contentReturnValue = .state(content: .beaconInfo)
         
         let notificationItem = NotificationItemProxyMock(.init(event: .timeline(event: event),
@@ -253,7 +253,6 @@ nonisolated struct NotificationContentBuilderTests {
     mutating func otherStateEventNotification() async {
         let event = TimelineEventSDKMock()
         event.eventIdReturnValue = UUID().uuidString
-        event.timestampReturnValue = 0
         event.contentReturnValue = .state(content: .roomName)
         
         let notificationItem = NotificationItemProxyMock(.init(event: .timeline(event: event),