fixing some more xml issues