Event fixes for iOS