Update stuff for CB 1.7.2