bugfixes in CFG