Client, bugfixes