Fixing errors in Events