Fixes for iOS version