Better conformance to W3C