diff --git a/ElementX/Sources/Screens/RoomThreadListScreen/RoomThreadListScreenCoordinator.swift b/ElementX/Sources/Screens/RoomThreadListScreen/RoomThreadListScreenCoordinator.swift
index 8a0f38b73..054814157 100644
--- a/ElementX/Sources/Screens/RoomThreadListScreen/RoomThreadListScreenCoordinator.swift
+++ b/ElementX/Sources/Screens/RoomThreadListScreen/RoomThreadListScreenCoordinator.swift
@@ -5,8 +5,6 @@
 // Please see LICENSE files in the repository root for full details.
 //
 
-// periphery:ignore:all - this is just a roomThreadList remove this comment once generating the final file
-
 import Combine
 import SwiftUI
 
diff --git a/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
index d87f4a738..3d7fd9f77 100644
--- a/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
+++ b/ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
@@ -264,7 +264,7 @@ private extension EventBasedTimelineItemProtocol {
             return locationTimelineItem.content.geoURI == nil ||
                 properties.replyDetails != nil ||
                 properties.isThreaded ? defaultInsets : .zero
-        case let liveLocationTimelineItem as LiveLocationRoomTimelineItem:
+        case is LiveLocationRoomTimelineItem:
             return properties.replyDetails != nil ||
                 properties.isThreaded ? defaultInsets : .zero
         default:
diff --git a/ElementX/Sources/Services/Room/JoinedRoomProxy.swift b/ElementX/Sources/Services/Room/JoinedRoomProxy.swift
index bcdae9751..68628a7ef 100644
--- a/ElementX/Sources/Services/Room/JoinedRoomProxy.swift
+++ b/ElementX/Sources/Services/Room/JoinedRoomProxy.swift
@@ -204,7 +204,7 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
     }
     
     func threadListService() async -> RoomThreadListServiceProxyProtocol {
-        await RoomThreadListProxy(threadListService: room.threadListService(), eventStringBuilder: eventStringBuilder)
+        RoomThreadListProxy(threadListService: room.threadListService(), eventStringBuilder: eventStringBuilder)
     }
     
     func loadOrFetchEventDetails(for eventID: String) async -> Result<TimelineEvent, RoomProxyError> {
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemViewState.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemViewState.swift
index a86a70b31..b0709f6fd 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemViewState.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemViewState.swift
@@ -198,7 +198,7 @@ enum RoomTimelineItemType: Equatable {
         case .liveLocation(let item):
             return item.timestamp
         case .group(let item):
-            return (item.items.first(where: { $0 is EventBasedTimelineItemProtocol }) as? EventBasedTimelineItemProtocol)?.timestamp
+            return (item.items.first { $0 is EventBasedTimelineItemProtocol } as? EventBasedTimelineItemProtocol)?.timestamp
         case .readMarker, .paginationIndicator, .timelineStart:
             return nil
         }