Fixing cb issues.