Fixed validation for wizard forms