Fix arrays/plurals