Improved CBF output when not using patch command