Fix inconsistencies with step validation.