Fix accents issues; Fix updating of xml