Fix visible null exception, and some partial HeatmapDataHeader changes.