Lint fixes

Zorro failures !