Fixed villager trades and villager chest loot