fix validation issues.