Fix some validation issues.