Fix xml structure.