Minor fixes on Client