Further HTML validation fixes.