Fixed issues with villager editor