Fixed field validation issues