fixes in data validation