Some heatmap fixes