Fixing more validation issues