diff --git a/submodules/Components/MultilineTextWithEntitiesComponent/Sources/MultilineTextWithEntitiesComponent.swift b/submodules/Components/MultilineTextWithEntitiesComponent/Sources/MultilineTextWithEntitiesComponent.swift
index c48a0bf5e5..99543a244b 100644
--- a/submodules/Components/MultilineTextWithEntitiesComponent/Sources/MultilineTextWithEntitiesComponent.swift
+++ b/submodules/Components/MultilineTextWithEntitiesComponent/Sources/MultilineTextWithEntitiesComponent.swift
@@ -172,7 +172,7 @@ public final class MultilineTextWithEntitiesComponent: Component {
             self.textNode.longTapAttributeAction = component.longTapAction
                         
             if case let .curve(duration, _) = transition.animation, let previousText = previousText, previousText != attributedString.string {
-                if let snapshotView = self.snapshotView(afterScreenUpdates: false) {
+                if let snapshotView = self.snapshotContentTree() {
                     snapshotView.center = self.center
                     self.superview?.addSubview(snapshotView)
                     
diff --git a/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m b/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
index 1f91db27ef..6d41c82b63 100644
--- a/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
+++ b/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
@@ -205,7 +205,7 @@
                 return;
             
             [strongController dismissAnimated:true];
-            if (strongSelf != nil) {
+            if (strongSelf != nil && strongSelf.requestAvatarEditor) {
                 strongSelf.requestAvatarEditor(^(UIImage *image, void (^commit)(void)) {
                     __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf;
                     if (strongSelf == nil)
diff --git a/submodules/ManagedFile/Sources/ManagedFile.swift b/submodules/ManagedFile/Sources/ManagedFile.swift
index ba5c4a5cbf..34ddd4eadc 100644
--- a/submodules/ManagedFile/Sources/ManagedFile.swift
+++ b/submodules/ManagedFile/Sources/ManagedFile.swift
@@ -61,8 +61,10 @@ public final class ManagedFile {
         if let queue = self.queue {
             assert(queue.isCurrent())
         }
-        close(self.fd)
-        self.isClosed = true
+        if !self.isClosed {
+            close(self.fd)
+            self.isClosed = true
+        }
     }
     
     public func write(_ data: UnsafeRawPointer, count: Int) -> Int {
diff --git a/submodules/SparseItemGrid/Sources/SparseItemGridScrollingArea.swift b/submodules/SparseItemGrid/Sources/SparseItemGridScrollingArea.swift
index e29e306800..fa1099becf 100644
--- a/submodules/SparseItemGrid/Sources/SparseItemGridScrollingArea.swift
+++ b/submodules/SparseItemGrid/Sources/SparseItemGridScrollingArea.swift
@@ -628,7 +628,7 @@ public final class RollingText: Component {
                     
                     self.containerView.layer.removeAnimation(forKey: "opacity")
                 }
-                if let snapshotView = self.containerView.snapshotView(afterScreenUpdates: true) {
+                if let snapshotView = self.containerView.snapshotContentTree() {
                     let horizontalOffset = boundingRect.width - snapshotView.frame.width
                     let verticalOffset: CGFloat = 12.0