Improvements for iOS