Trying to fix API errors