some fixes to call stack