Fix heatmaps