CBC fixes