CLI fixes. Slowly getting there...