Fix errors reported during prevalidation.