diff --git a/submodules/ShimmerEffect/BUCK b/submodules/ShimmerEffect/BUCK
index e30e043eab..0b768d1ef4 100644
--- a/submodules/ShimmerEffect/BUCK
+++ b/submodules/ShimmerEffect/BUCK
@@ -6,8 +6,8 @@ static_library(
         "Sources/**/*.swift",
     ]),
     deps = [
-        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
-        "//submodules/Display:Display",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
+        "//submodules/Display:Display#shared",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/TooltipUI/BUCK b/submodules/TooltipUI/BUCK
index ad85d29e1e..fc70b99e7c 100644
--- a/submodules/TooltipUI/BUCK
+++ b/submodules/TooltipUI/BUCK
@@ -11,8 +11,8 @@ static_library(
         "//submodules/TelegramPresentationData:TelegramPresentationData",
         "//submodules/AppBundle:AppBundle",
         "//submodules/AnimatedStickerNode:AnimatedStickerNode",
-        "//submodules/SyncCore:SyncCore",
-        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore#shared",
+        "//submodules/TelegramCore:TelegramCore#shared",
         "//submodules/TextFormat:TextFormat",
     ],
     frameworks = [
diff --git a/submodules/rlottie/config.h b/submodules/rlottie/config.h
index cac85658ea..61aa5aa420 100755
--- a/submodules/rlottie/config.h
+++ b/submodules/rlottie/config.h
@@ -2,7 +2,9 @@
 #define CONFIG_H
 
 // enable threading
-#define LOTTIE_THREAD_SUPPORT
+//#define LOTTIE_THREAD_SUPPORT
+
+#define LOTTIE_THREAD_SAFE
 
 //enable logging
 //#define LOTTIE_LOGGING_SUPPORT
@@ -16,4 +18,4 @@
 // disable image loader
 #define LOTTIE_IMAGE_MODULE_DISABLED
 
-#endif  // CONFIG_H
\ No newline at end of file
+#endif  // CONFIG_H
diff --git a/submodules/rlottie/rlottie b/submodules/rlottie/rlottie
index 0ee2e9c584..d513b026d8 160000
--- a/submodules/rlottie/rlottie
+++ b/submodules/rlottie/rlottie
@@ -1 +1 @@
-Subproject commit 0ee2e9c5843257ccd11672611829b9bb5d02aa98
+Subproject commit d513b026d8d4b0472ffca3b494300a26f10f5b38