Fixed bugs related to DFG construction.