Fixup suggestions from linting