Fix client type signatures