Updates to fix up targets and wizard