Fixed incompatible APIs in CBI