diff --git a/TelegramCore/AccountState.swift b/TelegramCore/AccountState.swift
index 21be89ae74..89c292d1ca 100644
--- a/TelegramCore/AccountState.swift
+++ b/TelegramCore/AccountState.swift
@@ -1,9 +1,5 @@
 import Foundation
-#if os(macOS)
-    import PostboxMac
-#else
-    import Postbox
-#endif
+import Postbox
 
 private enum SentAuthorizationCodeTypeValue: Int32 {
     case otherSession = 0
diff --git a/TelegramCore/ManagedRecentStickers.swift b/TelegramCore/ManagedRecentStickers.swift
index e35103c424..ff1830312d 100644
--- a/TelegramCore/ManagedRecentStickers.swift
+++ b/TelegramCore/ManagedRecentStickers.swift
@@ -11,8 +11,8 @@ private func hashForIdsReverse(_ ids: [Int64]) -> Int32 {
     var acc: UInt32 = 0
     
     for id in ids {
-        let low = UInt32(UInt64(bitPattern: id) & UInt64(0xffffffff))
-        let high = UInt32((UInt64(bitPattern: id) >> 32) & UInt64(0xffffffff))
+        let low = UInt32(UInt64(bitPattern: id) & (0xffffffff as UInt64))
+        let high = UInt32((UInt64(bitPattern: id) >> 32) & (0xffffffff as UInt64))
         
         acc = (acc &* 20261) &+ high
         acc = (acc &* 20261) &+ low