Client bugfixes and changes.