Correct more HTML validation failures