Fixing the XML functions.
They need to call the XML specific functions for sub-elements.