Leftover updates to the wizard controller.
Fixed merge conflicts