diff --git a/submodules/TelegramCore/Sources/MacOS/MacInternalUpdater.swift b/submodules/TelegramCore/Sources/MacOS/MacInternalUpdater.swift
index b8065ede7f..2f935c149d 100644
--- a/submodules/TelegramCore/Sources/MacOS/MacInternalUpdater.swift
+++ b/submodules/TelegramCore/Sources/MacOS/MacInternalUpdater.swift
@@ -14,17 +14,17 @@ public enum InternalUpdaterError {
 public func requestUpdatesXml(account: Account, source: String) -> Signal<Data, InternalUpdaterError> {
     return TelegramEngine(account: account).peers.resolvePeerByName(name: source)
         |> castError(InternalUpdaterError.self)
-        |> mapToSignal { peer -> Signal<Peer?, InternalUpdaterError> in
-            return .single(peer?._asPeer())
+        |> map { peer -> Peer? in
+            return peer?._asPeer()
         }
-        |> mapToSignal { peer in
+        |> mapToSignal { peer -> Signal<Data, InternalUpdaterError> in
             if let peer = peer, let inputPeer = apiInputPeer(peer) {
                 return account.network.request(Api.functions.messages.getHistory(peer: inputPeer, offsetId: 0, offsetDate: 0, addOffset: 0, limit: 1, maxId: Int32.max, minId: 0, hash: 0))
                     |> retryRequest
                     |> castError(InternalUpdaterError.self)
                     |> mapToSignal { result in
                         switch result {
-                        case let .channelMessages(_, _, _, _, apiMessages, apiChats, apiUsers):
+                        case let .channelMessages(_, _, _, _, apiMessages, _, apiChats, apiUsers):
                             if let apiMessage = apiMessages.first, let storeMessage = StoreMessage(apiMessage: apiMessage) {
                                 
                                 var peers: [PeerId: Peer] = [:]
@@ -67,7 +67,7 @@ public func requestUpdatesXml(account: Account, source: String) -> Signal<Data,
             } else {
                 return .fail(.xmlLoad)
             }
-    }
+        }
 }
 
 public enum AppUpdateDownloadResult {
@@ -89,7 +89,7 @@ public func downloadAppUpdate(account: Account, source: String, messageId: Int32
                     |> castError(InternalUpdaterError.self)
                     |> mapToSignal { messages in
                         switch messages {
-                        case let .channelMessages(_, _, _, _, apiMessages, apiChats, apiUsers):
+                        case let .channelMessages(_, _, _, _, apiMessages, _, apiChats, apiUsers):
                             
                             var peers: [PeerId: Peer] = [:]
                             for chat in apiChats {
diff --git a/submodules/TelegramVoip/Sources/GroupCallContext.swift b/submodules/TelegramVoip/Sources/GroupCallContext.swift
index 1e47048fb3..ddec28e0e7 100644
--- a/submodules/TelegramVoip/Sources/GroupCallContext.swift
+++ b/submodules/TelegramVoip/Sources/GroupCallContext.swift
@@ -576,10 +576,12 @@ public final class OngoingGroupCallContext {
             
             self.audioSessionActiveDisposable.set((audioSessionActive
             |> deliverOn(queue)).start(next: { [weak self] isActive in
-                guard let self else {
+                guard let `self` = self else {
                     return
                 }
+                #if os(iOS)
                 self.context.setManualAudioSessionIsActive(isActive)
+                #endif
             }))
         }
         
diff --git a/submodules/TelegramVoip/Sources/OngoingCallContext.swift b/submodules/TelegramVoip/Sources/OngoingCallContext.swift
index 7d5dfdb24b..3fedf43db4 100644
--- a/submodules/TelegramVoip/Sources/OngoingCallContext.swift
+++ b/submodules/TelegramVoip/Sources/OngoingCallContext.swift
@@ -579,7 +579,9 @@ extension OngoingCallThreadLocalContextWebrtc: OngoingCallThreadLocalContextProt
     }
     
     func nativeSetIsAudioSessionActive(isActive: Bool) {
+        #if os(iOS)
         self.setManualAudioSessionIsActive(isActive)
+        #endif
     }
 }
 
@@ -1482,7 +1484,7 @@ private final class CallSignalingConnectionManager {
             let connection = CallSignalingConnectionImpl(queue: queue, host: host, port: port, peerTag: self.peerTag, dataReceived: { data in
                 dataReceived(data)
             }, isClosed: { [weak self] in
-                guard let self else {
+                guard let `self` = self else {
                     return
                 }
                 self.handleConnectionFailed(id: id)