Linting error fixes