Minor cli touchups