XML bugfixing.