[TIMOB-16425] Final CLI fixes