Tweak types for heap