Fixed HTML5 issues