More XHTML corrections (Bug 3211)