Fix keyvaluestore bugs(temp)

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>