More fixing for iOS