Tidy up some Lint errors