Error corrections for the CLI