Changed heap tree swap to use effects.swapValue to fix  few issues