Minor cli fixes