More fixed for lint and application win