Small fixes to heatmap plugin