Fix self-linting issues