Fix up some validation issues.