Few more updates to the Hawk validators