Minor CLI fixes