Fixes to pass linting