Improved html5 compliance.