Fix issues with new events