Fixup Lint warnings