Minor fixes to KeyValueStore and RocksDBKeyValueStore