Compatibility fixes to API

These are needed for the cba integration