Fix linting issues