More Spell fixes! Thanks to @TheConquistador