Tweek heat drain and electroshock CBMs

Fixes #2119