Fixed validation issues