(cli) Minor fixes