Fix some more wand bugs