Enchanting fixes