Fix issues with linting