Work on wand fixes