Fixed Enchant bugs