Validation extra fixes