Fixed validation issues with Dec 21.