Even more XHTML fixes #2