Fix some validation errors