Bugfixes for cbn Correction