Some fixes on the CLI script