Minor changes in server-client communication