Fixes to use the xml:base