Fix validation issues