changs required to match soot-infoflow in unstable branch