Even more XHTML fixes