Fix API calls