Some more linter warnings