Fix XML

Some XML fixes.