Should have fixed most of the Event issues.