Small adjustments (XML standalone...namespaces...)