heatmap fixes