Tweek heat drain CBM

Fixes #2119