Further fixes of Spells