Fix CLI inconsistencies