Correct some linting issues