More fixes to an old and broken api_client </frustration>