Fixed XML validation errors