Adding fixes for wizard step two