Fix xml remarks