Tweak validator script