More fixes for unicode encoding issues with XML nodes.