A few cli updates.