Event updates and fixes