Fix validation/failure management
Minor integration changes