[DF-4721] fixes for iOS