Fix a few Lint errors and warnings