fix: several api fixes

[acha-bill]

Checklist

• [x] I have read the coding guide.
• [x] My change requires a documentation update, and I have done it.
• [x] I have added tests to cover my changes.
• [ ] I have filled out the description and linked the related issues.

Description

Some api fixes

[istae]

to be merged after 2.1 release