Fixes for the heatmapper wrapper.