Fixed last glitches in the XML files.
This commit is still not complete.