Minor heat map fixes