Fixing issues on apis