Improvements mostly related to client-server usage