Fix some references to CFG