Finally some fixes for iOS