more tweaks to KVServer