more fixes to linting errors