Improvements mostly related to client-server usage

Is this double invocation performed on purpose?