more fixes to validation