Fix ownership of cli
Fix mode