HTML conformance fixes