Updates to pass HTML5 validation