Compatibility fixes to API

These are needed for the cba integration
I think they are fine for now.