Fixes for improved heat tallies