Various invalid XHTML fixes for i18n