Fix further linting issues