fixes for optimCBP