Fixing validation issues