Fix failing new validations in orphans_steps