Fix html5 issues