Small improvements to the Client interface