diff --git a/Sources/Shared/Models/AppModel.swift b/Sources/Shared/Models/AppModel.swift
index bf9b9bb..fa25ab2 100644
--- a/Sources/Shared/Models/AppModel.swift
+++ b/Sources/Shared/Models/AppModel.swift
@@ -2270,7 +2270,7 @@ final class AppModel: ObservableObject {
         }
 
         guard !messages[index].isRetracted else { return }
-        var updatedMessage = messages[index]
+        let updatedMessage = messages[index]
         let existingIndex = updatedMessage.reactions.firstIndex { reaction in
             reactionSenderMatches(
                 reaction.senderJID,
@@ -2502,7 +2502,7 @@ final class AppModel: ObservableObject {
                 updateConversationPreview(for: messages[index], incrementUnread: false)
                 return false
             }
-            var merged = message
+            let merged = message
             if previous.direction == .outgoing && message.direction == .outgoing {
                 merged.localFilename = previous.localFilename ?? message.localFilename
                 merged.mimeType = previous.mimeType ?? message.mimeType
diff --git a/Sources/Shared/XMPP/LumaConnectionStatsModule.swift b/Sources/Shared/XMPP/LumaConnectionStatsModule.swift
index 9a0441d..c3630cd 100644
--- a/Sources/Shared/XMPP/LumaConnectionStatsModule.swift
+++ b/Sources/Shared/XMPP/LumaConnectionStatsModule.swift
@@ -35,7 +35,7 @@ final class LumaConnectionStatsModule: XmppModuleBase, XmppModule, XmppStanzaFil
 
     func processIncoming(stanza: Stanza) -> Bool {
         if stanza.xmlns == Self.smNamespace, stanza.name == "a" {
-            if let raw = stanza.getAttribute("h"), let value = UInt32(raw) {
+            if let raw = stanza.attribute("h"), let value = UInt32(raw) {
                 lock.lock()
                 acknowledged = value
                 lock.unlock()
diff --git a/Sources/Shared/XMPP/XMPPService.swift b/Sources/Shared/XMPP/XMPPService.swift
index c2a0212..f479619 100644
--- a/Sources/Shared/XMPP/XMPPService.swift
+++ b/Sources/Shared/XMPP/XMPPService.swift
@@ -1,7 +1,7 @@
 import Combine
 import Foundation
-import Martin
-import MartinOMEMO
+@preconcurrency import Martin
+@preconcurrency import MartinOMEMO
 import WebRTC
 
 private struct BufferedArchiveStanza {