Update and fix dom-to-xhtml