Fixes to calling signatures for CPR