Fix client->server communication