Minor XML fixes.