Fix some cb compatibilities.