cli: multiple fixes