More errors found via linting