More html5 fixes