Some atom.xml fixes