More villager fixes