Fix some validation errors.