Fixes (at least some) of the recursive power-drain crash issues.