New lint and fixes accordingly