Fixing inconsistant cli calls