Fixes on callchain
Fixes on CallChain