Some minor changes in server and client