fixes in validation