More validation errors resolved