XHTML conformity fixes.