Bugfixes to dbClient, dbServer