Heap fixes