fixes to validation