Fixing validation issues on the wizard