small cli fixes