Tweaks for CB 1.4.