Some small changes that came while developing the client C++ library