Fix up villager code?