More async spells fixes