Small changes to XML parser