Lots of lint changes