More fixes for validation