BF: Fixed some remaining issues in the CLIs from refactor.