Lots of small lint fixes