Fix a potential recursion issue in the wand
HP: Spell tweaks