Fix minor errors in XHTML output (missing elements)