cli: Minor fixes to command handling

Signed-off-by: Michael Ikey Doherty <michael.i.doherty@intel.com>