Wand fixes. Closes #171