small fixup of server and client