some more linter fixes