Updated for CB 1.5.2-R1.1; fixed various NPEs