fixing xml issues