Resolved bugs in cli