Fixed pluralization weirdness