Fixed compliation issues as a result of wand changes