Few fixes for lint