Few minor updates to CLI.