Fix the bugs related to control flow graph.