XML Highlight, some fixes