Changes to pass validation checks for HTML5