HTML5 fixes
cleaning conflicts