Fixed issues with heatmap plots