More XML markup fixes.