Fix more linter warnings