More tweaks for the CLI App