Fix pluralizations