A few changes for lint