Bugfixes for the client.