Fixes to API signature.