Misc changes for cb 1.5.1