Minor validator improvement