Minor HTML Gen improvments