Fix to XML in/out