Fixing atom xml issues