Fix a few linting issues