Fix Errors in BaseApiClient