more validation corrections