Fix XML parsers and renderers