Fix after pluralisation changes