#6 XHTML validation fixes