More linting tweaks