Fix for lint errors