Various linter fixes