CKM: Adjust to C++ API changes