Fixing validation errors.