diff --git a/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift b/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
index c8c2e9fe..66cbaedd 100644
--- a/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
+++ b/Packages/Conversations/Sources/Conversations/Detail/ConversationMessageView.swift
@@ -106,10 +106,11 @@ struct ConversationMessageView: View {
     Button {
       Task {
         do {
-          let status: Status = if isLiked {
-            try await client.post(endpoint: Statuses.unfavorite(id: message.id))
+          let status: Status
+          if isLiked {
+            status = try await client.post(endpoint: Statuses.unfavorite(id: message.id))
           } else {
-            try await client.post(endpoint: Statuses.favorite(id: message.id))
+            status = try await client.post(endpoint: Statuses.favorite(id: message.id))
           }
           withAnimation {
             isLiked = status.favourited == true
@@ -122,10 +123,11 @@ struct ConversationMessageView: View {
     }
     Button { Task {
       do {
-        let status: Status = if isBookmarked {
-          try await client.post(endpoint: Statuses.unbookmark(id: message.id))
+        let status: Status
+        if isBookmarked {
+          status = try await client.post(endpoint: Statuses.unbookmark(id: message.id))
         } else {
-          try await client.post(endpoint: Statuses.bookmark(id: message.id))
+          status = try await client.post(endpoint: Statuses.bookmark(id: message.id))
         }
         withAnimation {
           isBookmarked = status.bookmarked == true
diff --git a/Packages/Env/Sources/Env/UserPreferences.swift b/Packages/Env/Sources/Env/UserPreferences.swift
index f5b21e41..559efd6c 100644
--- a/Packages/Env/Sources/Env/UserPreferences.swift
+++ b/Packages/Env/Sources/Env/UserPreferences.swift
@@ -373,7 +373,7 @@ import SwiftUI
   }
 
   public var totalNotificationsCount: Int {
-    notificationsCount.compactMap(\.value).reduce(0, +)
+    notificationsCount.compactMap{ $0.value }.reduce(0, +)
   }
 
   public func reloadNotificationsCount(tokens: [OauthToken]) {
diff --git a/Packages/Models/Sources/Models/SwiftData/Draft.swift b/Packages/Models/Sources/Models/SwiftData/Draft.swift
index 6a456b93..34418c89 100644
--- a/Packages/Models/Sources/Models/SwiftData/Draft.swift
+++ b/Packages/Models/Sources/Models/SwiftData/Draft.swift
@@ -4,7 +4,7 @@ import SwiftUI
 
 @Model public class Draft {
   public var content: String = ""
-  public var creationDate: Date = .init()
+  public var creationDate: Date = Date()
 
   public init(content: String) {
     self.content = content
diff --git a/Packages/Models/Sources/Models/SwiftData/LocalTimeline.swift b/Packages/Models/Sources/Models/SwiftData/LocalTimeline.swift
index a24fd380..84319a10 100644
--- a/Packages/Models/Sources/Models/SwiftData/LocalTimeline.swift
+++ b/Packages/Models/Sources/Models/SwiftData/LocalTimeline.swift
@@ -4,7 +4,7 @@ import SwiftUI
 
 @Model public class LocalTimeline {
   public var instance: String = ""
-  public var creationDate: Date = .init()
+  public var creationDate: Date = Date()
 
   public init(instance: String) {
     self.instance = instance
diff --git a/Packages/Models/Sources/Models/SwiftData/TagGroup.swift b/Packages/Models/Sources/Models/SwiftData/TagGroup.swift
index 910d1f97..de8acfe1 100644
--- a/Packages/Models/Sources/Models/SwiftData/TagGroup.swift
+++ b/Packages/Models/Sources/Models/SwiftData/TagGroup.swift
@@ -6,7 +6,7 @@ import SwiftUI
   public var title: String = ""
   public var symbolName: String = ""
   public var tags: [String] = []
-  public var creationDate: Date = .init()
+  public var creationDate: Date = Date()
 
   public init(title: String, symbolName: String, tags: [String]) {
     self.title = title