small validation fixes