Fixed a compilation error.
Some improvements to CLI.