Fix/pluralize units