More linting fixes
Merge branch 'develop'