Staff + Spell Fixes