More validator changes.