Minor XML cleanups