Fix some places in CLI;