More linting fixes.