some validation corrections

some validation corrections