Minor update to validator