HTML5 Compliance Cleanup