Fixed CFG compilation errors.