Fix ApiClient constructors