wizard workflow fixes