Spell system tweaks