Fixes for HTML5 validation