More HTML validation fixes