Minor changes related to xml namespaces