Some CLI fixes