Fixing HTML5 validation errors yet again