Fixing Events issues.