Fix XHTML validation errors