Made some things HTML5-compliant