finalised fixes for XML parsers