Add fixes for iOS