Fix client and server