fixes in XInclude processing