More linter changes