Heatmap fixes and other minor tweaks