XML doc enhancements and fixes.