Corrected validation issues