Tweak the CLI