Villager, Memory leak fixes