Minor HTML Gen improvments

No match.