Fix some mistakes in the CLI