[FIX] Client api fixes