fix validation issues