small fixes to XML structures