WIP running through of lint fixes