Fixed a few XHTML bugS