minor fixes in validation