fixed small validation issues