Fixed validation issues for several pages