Fixes some API calls interfaces
Merge branch 'api_fixes' into next