Minor updates to validator files