small validation changes