more fixes for lint