* Fixes of the API functions