Minor changes
Update for CB 1.5.2-1.0