More villager changes.