a few CLI fixes