diff --git a/submodules/Postbox/Sources/MessageHistoryMetadataTable.swift b/submodules/Postbox/Sources/MessageHistoryMetadataTable.swift
index f06f29b571..1e2517bb89 100644
--- a/submodules/Postbox/Sources/MessageHistoryMetadataTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryMetadataTable.swift
@@ -81,6 +81,7 @@ final class MessageHistoryMetadataTable: Table {
     private func peerThreadHoleIndexInitializedKey(peerId: PeerId, threadId: Int64) -> ValueBoxKey {
         self.sharedPeerThreadHoleIndexInitializedKey.setInt64(0, value: peerId.toInt64())
         self.sharedPeerThreadHoleIndexInitializedKey.setInt8(8, value: MetadataPrefix.PeerHistoryThreadHoleIndexInitialized.rawValue)
+        self.sharedPeerThreadHoleIndexInitializedKey.setInt64(0, value: threadId)
         return self.sharedPeerThreadHoleIndexInitializedKey
     }
     
diff --git a/submodules/Postbox/Sources/MessageHistoryThreadHoleIndexTable.swift b/submodules/Postbox/Sources/MessageHistoryThreadHoleIndexTable.swift
index d973c85cb8..58987f71b7 100644
--- a/submodules/Postbox/Sources/MessageHistoryThreadHoleIndexTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryThreadHoleIndexTable.swift
@@ -110,6 +110,7 @@ final class MessageHistoryThreadHoleIndexTable: Table {
     
     private func ensureInitialized(peerId: PeerId, threadId: Int64) {
         if !self.metadataTable.isThreadHoleIndexInitialized(peerId: peerId, threadId: threadId) {
+            postboxLog("MessageHistoryThreadHoleIndexTable: Initializing \(peerId) \(threadId)")
             self.metadataTable.setIsThreadHoleIndexInitialized(peerId: peerId, threadId: threadId)
             
             if let messageNamespaces = self.seedConfiguration.messageThreadHoles[peerId.namespace] {
diff --git a/submodules/TelegramCore/Sources/ApiGroupOrChannel.swift b/submodules/TelegramCore/Sources/ApiGroupOrChannel.swift
index 3b1d5175d9..246cb0a565 100644
--- a/submodules/TelegramCore/Sources/ApiGroupOrChannel.swift
+++ b/submodules/TelegramCore/Sources/ApiGroupOrChannel.swift
@@ -162,7 +162,7 @@ func mergeChannel(lhs: TelegramChannel?, rhs: TelegramChannel) -> TelegramChanne
         return rhs
     }
     
-    if case .personal = rhs.accessHash {
+    if case .personal? = rhs.accessHash {
         return rhs
     }
     
@@ -185,9 +185,9 @@ func mergeChannel(lhs: TelegramChannel?, rhs: TelegramChannel) -> TelegramChanne
     if let rhsAccessHashValue = lhs.accessHash, case .personal = rhsAccessHashValue {
         accessHash = rhsAccessHashValue
     } else {
-        accessHash = lhs.accessHash ?? rhs.accessHash
+        accessHash = rhs.accessHash ?? lhs.accessHash
     }
     
-    return TelegramChannel(id: lhs.id, accessHash: accessHash, title: rhs.title, username: rhs.username, photo: rhs.photo, creationDate: lhs.creationDate, version: lhs.version, participationStatus: lhs.participationStatus, info: info, flags: channelFlags, restrictionInfo: lhs.restrictionInfo, adminRights: lhs.adminRights, bannedRights: lhs.bannedRights, defaultBannedRights: rhs.defaultBannedRights)
+    return TelegramChannel(id: lhs.id, accessHash: accessHash, title: rhs.title, username: rhs.username, photo: rhs.photo, creationDate: rhs.creationDate, version: rhs.version, participationStatus: rhs.participationStatus, info: info, flags: channelFlags, restrictionInfo: rhs.restrictionInfo, adminRights: rhs.adminRights, bannedRights: rhs.bannedRights, defaultBannedRights: rhs.defaultBannedRights)
 }
 
diff --git a/submodules/TelegramCore/Sources/BlockedPeersContext.swift b/submodules/TelegramCore/Sources/BlockedPeersContext.swift
index c956554550..06985ae459 100644
--- a/submodules/TelegramCore/Sources/BlockedPeersContext.swift
+++ b/submodules/TelegramCore/Sources/BlockedPeersContext.swift
@@ -219,15 +219,17 @@ public final class BlockedPeersContext {
             }
             |> mapToSignal { value in
                 return postbox.transaction { transaction -> Peer? in
-                    transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in
-                        let previous: CachedUserData
-                        if let current = current as? CachedUserData {
-                            previous = current
-                        } else {
-                            previous = CachedUserData()
-                        }
-                        return previous.withUpdatedIsBlocked(false)
-                    })
+                    if peerId.namespace == Namespaces.Peer.CloudUser {
+                        transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in
+                            let previous: CachedUserData
+                            if let current = current as? CachedUserData {
+                                previous = current
+                            } else {
+                                previous = CachedUserData()
+                            }
+                            return previous.withUpdatedIsBlocked(false)
+                        })
+                    }
                     return transaction.getPeer(peerId)
                 }
                 |> castError(BlockedPeersContextRemoveError.self)
diff --git a/submodules/TelegramCore/Sources/CallSessionManager.swift b/submodules/TelegramCore/Sources/CallSessionManager.swift
index 80ab35f54e..69401d05cb 100644
--- a/submodules/TelegramCore/Sources/CallSessionManager.swift
+++ b/submodules/TelegramCore/Sources/CallSessionManager.swift
@@ -574,6 +574,8 @@ private final class CallSessionManagerContext {
                     self.ringingStatesUpdated()
                 }
             }
+        } else {
+            self.contextUpdated(internalId: internalId)
         }
     }
     
diff --git a/submodules/TelegramCore/Sources/Network.swift b/submodules/TelegramCore/Sources/Network.swift
index 4e7a4a2c60..07355983ed 100644
--- a/submodules/TelegramCore/Sources/Network.swift
+++ b/submodules/TelegramCore/Sources/Network.swift
@@ -479,7 +479,7 @@ func initializedNetwork(accountId: AccountRecordId, arguments: NetworkInitializa
                 let key = SharedContextStore.Key(accountId: accountId)
                 
                 let context: MTContext
-                if let current = store.contexts[key] {
+                if false, let current = store.contexts[key] {
                     context = current
                     context.updateApiEnvironment({ _ in return apiEnvironment})
                 } else {
diff --git a/submodules/TelegramCore/Sources/TelegramUser.swift b/submodules/TelegramCore/Sources/TelegramUser.swift
index d152c205ee..ce21b5298d 100644
--- a/submodules/TelegramCore/Sources/TelegramUser.swift
+++ b/submodules/TelegramCore/Sources/TelegramUser.swift
@@ -143,7 +143,7 @@ extension TelegramUser {
         guard let lhs = lhs else {
             return rhs
         }
-        if case .personal = rhs.accessHash {
+        if case .personal? = rhs.accessHash {
             return rhs
         } else {
             var userFlags: UserInfoFlags = []
diff --git a/submodules/TelegramCore/Sources/UpdateMessageMedia.swift b/submodules/TelegramCore/Sources/UpdateMessageMedia.swift
index 2112312b18..70ec3b7ce3 100644
--- a/submodules/TelegramCore/Sources/UpdateMessageMedia.swift
+++ b/submodules/TelegramCore/Sources/UpdateMessageMedia.swift
@@ -85,14 +85,14 @@ private func updateMessageThreadStatsInternal(transaction: Transaction, threadMe
                 let count = max(0, attribute.count + countDifference)
                 var maxMessageId = attribute.maxMessageId
                 var maxReadMessageId = attribute.maxReadMessageId
-                if let maxAddedId = addedMessagePeers.map(\.messageId.id).max() {
+                if let maxAddedId = addedMessagePeers.map({ $0.messageId.id }).max() {
                     if let currentMaxMessageId = maxMessageId {
                         maxMessageId = max(currentMaxMessageId, maxAddedId)
                     } else {
                         maxMessageId = maxAddedId
                     }
                 }
-                if let maxAddedReadId = addedMessagePeers.filter(\.isOutgoing).map(\.messageId.id).max() {
+                if let maxAddedReadId = addedMessagePeers.filter({ $0.isOutgoing }).map({ $0.messageId.id }).max() {
                     if let currentMaxMessageId = maxReadMessageId {
                         maxReadMessageId = max(currentMaxMessageId, maxAddedReadId)
                     } else {
@@ -100,7 +100,7 @@ private func updateMessageThreadStatsInternal(transaction: Transaction, threadMe
                     }
                 }
                 
-                attributes[j] = ReplyThreadMessageAttribute(count: count, latestUsers: mergeLatestUsers(current: attribute.latestUsers, added: addedMessagePeers.map(\.id), isGroup: isGroup, isEmpty: count == 0), commentsPeerId: attribute.commentsPeerId, maxMessageId: maxMessageId, maxReadMessageId: maxReadMessageId)
+                attributes[j] = ReplyThreadMessageAttribute(count: count, latestUsers: mergeLatestUsers(current: attribute.latestUsers, added: addedMessagePeers.map({ $0.id }), isGroup: isGroup, isEmpty: count == 0), commentsPeerId: attribute.commentsPeerId, maxMessageId: maxMessageId, maxReadMessageId: maxReadMessageId)
             } else if let attribute = attributes[j] as? SourceReferenceMessageAttribute {
                 channelThreadMessageId = attribute.messageId
             }