Fix errors detected in validation.