Even more XHTML fixes #3