Fixed XML save problems