Fixed pluralisation issues