Minor tweaks to heatmap plotting