Trivial lint fixes