Minor fixes on client