Small edit and fix in XML save