Bugfixes for dbclient