Fixes to validation