Linting fixes