Fixed some errors with the latest update of events