Fix for lint errors in refactored events