Updates to automatice HTML5 support