Fix events for FF