Fixed Amulet issues