Fixes for lint errors