diff --git a/sf-replay/include/ReplayH5Reader.hpp b/sf-replay/include/ReplayH5Reader.hpp
index e3d6dee..2a2c5d8 100644
--- a/sf-replay/include/ReplayH5Reader.hpp
+++ b/sf-replay/include/ReplayH5Reader.hpp
@@ -17,10 +17,10 @@ class ReplayH5Reader {
     H5::DataSet dset_metadata_;
     H5::DataSet dset_frame_;
 
-    ModuleFrame* m_buffer_;
-    char* f_buffer_;
-    uint64_t buffer_start_pulse_id_;
-    uint64_t buffer_end_pulse_id_;
+    ModuleFrame* m_buffer_ = nullptr;
+    char* f_buffer_ = nullptr;
+    uint64_t buffer_start_pulse_id_ = 0;
+    uint64_t buffer_end_pulse_id_ = 0;
 
     void load_buffers(const uint64_t pulse_id);
 
diff --git a/sf-replay/test/test_ReplayH5Reader.cpp b/sf-replay/test/test_ReplayH5Reader.cpp
index aba63ba..17be0a0 100644
--- a/sf-replay/test/test_ReplayH5Reader.cpp
+++ b/sf-replay/test/test_ReplayH5Reader.cpp
@@ -1,6 +1,8 @@
+#include <gtest/gtest.h>
+#include <thread>
+
 #include "ReplayH5Reader.hpp"
 #include "BufferH5Writer.hpp"
-#include "gtest/gtest.h"
 
 using namespace std;
 using namespace core_buffer;