fixes for on-the-fly icfg