diff --git a/ElementX/Sources/Modules/Authentication/LoginScreen/LoginScreenCoordinator.swift b/ElementX/Sources/Modules/Authentication/LoginScreen/LoginScreenCoordinator.swift
index 5055b7815..2e1e48747 100644
--- a/ElementX/Sources/Modules/Authentication/LoginScreen/LoginScreenCoordinator.swift
+++ b/ElementX/Sources/Modules/Authentication/LoginScreen/LoginScreenCoordinator.swift
@@ -48,7 +48,7 @@ final class LoginScreenCoordinator: Coordinator, Presentable {
         loginScreenHostingController.isModalInPresentation = true
         
         loginScreenViewModel.completion = { [weak self] result in
-            MXLog.debug("[LoginScreenCoordinator] LoginScreenViewModel did complete with result: \(result).")
+            MXLog.debug("[LoginScreenCoordinator] LoginScreenViewModel did complete.")
             guard let self = self else { return }
             self.completion?(result)
         }
diff --git a/ElementX/Sources/Modules/HomeScreen/HomeScreenModels.swift b/ElementX/Sources/Modules/HomeScreen/HomeScreenModels.swift
index 7c7cb765e..9e58cc143 100644
--- a/ElementX/Sources/Modules/HomeScreen/HomeScreenModels.swift
+++ b/ElementX/Sources/Modules/HomeScreen/HomeScreenModels.swift
@@ -36,19 +36,19 @@ struct HomeScreenViewState: BindableState {
     var isLoadingRooms: Bool = false
     
     var firstDirectRooms: [HomeScreenRoom] {
-        Array(rooms.filter { $0.isDirect }.prefix(upTo: 5))
+        Array(rooms.filter { $0.isDirect }.prefix(5))
     }
     
     var otherDirectRooms: [HomeScreenRoom] {
-        Array(rooms.filter { $0.isDirect }.suffix(from: 5))
+        Array(rooms.filter { $0.isDirect }.dropFirst(5))
     }
     
     var firstNondirectRooms: [HomeScreenRoom] {
-        Array(rooms.filter { !$0.isDirect }.prefix(upTo: 5))
+        Array(rooms.filter { !$0.isDirect }.prefix(5))
     }
     
     var otherNondirectRooms: [HomeScreenRoom] {
-        Array(rooms.filter { !$0.isDirect }.suffix(from: 5))
+        Array(rooms.filter { !$0.isDirect }.dropFirst(5))
     }
 }