Fix XML support