Fixed validation issues.