minor validation changes