Fixes for tinyxml2