Improve html5 compliance