Fix HTML5 issues