more HTML validation fixes