Fixed some issues with the heap