Further fixes to the client-server protocol