Fix xml glitches