Linting fixes
Merge branch 'release/v0.0.15'