Heap update

Fixed some issues with ze heap