Fix XML validation errors