Html validation fixes