diff --git a/dozer-recordstore/src/in_memory/store.rs b/dozer-recordstore/src/in_memory/store.rs
index 169e3ed7ed..fe17519fae 100644
--- a/dozer-recordstore/src/in_memory/store.rs
+++ b/dozer-recordstore/src/in_memory/store.rs
@@ -50,11 +50,11 @@ impl ProcessorRecordStore {
             .records
             .range(start..)
             // We just removed all the
-            .map(|(id, record)| (id, RecordRef(record.upgrade().unwrap())))
+            .filter_map(|(&id, weak)| weak.upgrade().map(|record| (id, RecordRef(record))))
             .collect::<Vec<_>>();
         let data =
             bincode::serialize(&slice).map_err(|e| RecordStoreError::SerializationError {
-                typ: "[RecordRef]",
+                typ: "[(usize, RecordRef)]",
                 reason: Box::new(e),
             })?;
         Ok((data, slice.len()))
@@ -128,7 +128,7 @@ impl ProcessorRecordStoreDeserializer {
     pub fn deserialize_and_extend(&self, data: &[u8]) -> Result<(), RecordStoreError> {
         let slice: Vec<(usize, RecordRef)> =
             bincode::deserialize(data).map_err(|e| RecordStoreError::DeserializationError {
-                typ: "[Option<RecordRef>]",
+                typ: "[(usize, RecordRef)]",
                 reason: Box::new(e),
             })?;
 
diff --git a/dozer-recordstore/src/rocksdb.rs b/dozer-recordstore/src/rocksdb.rs
index 3597b7c227..98f41230c0 100644
--- a/dozer-recordstore/src/rocksdb.rs
+++ b/dozer-recordstore/src/rocksdb.rs
@@ -46,7 +46,7 @@ impl ProcessorRecordStore {
     }
 
     pub fn serialize_slice(&self, start: usize) -> Result<(Vec<u8>, usize), RecordStoreError> {
-        Ok((vec![0], self.num_records() - start)) // TODO: implement rocksdb record store checkpointing
+        Ok((vec![], self.num_records() - start)) // TODO: implement rocksdb record store checkpointing
     }
 
     pub fn deserialize_and_extend(&self, _data: &[u8]) -> Result<(), RecordStoreError> {