Minor changes

Minor changes in server and client.