diff --git a/jfj-combined/include/JfjFrameCache.hpp b/jfj-combined/include/JfjFrameCache.hpp
index 1d633b4..71d3ae9 100644
--- a/jfj-combined/include/JfjFrameCache.hpp
+++ b/jfj-combined/include/JfjFrameCache.hpp
@@ -2,9 +2,9 @@
 #define SF_DAQ_FRAME_CACHE_HPP
 
 // #include <cstddef>
-// #include <cstring>
 // #include <stdexcept>
 #include <iostream>
+#include <cstring>
 #include <vector>
 #include <functional>
 #include <shared_mutex>
diff --git a/jfj-combined/include/JfjFrameWorker.hpp b/jfj-combined/include/JfjFrameWorker.hpp
index 0f342f3..67d8ae0 100644
--- a/jfj-combined/include/JfjFrameWorker.hpp
+++ b/jfj-combined/include/JfjFrameWorker.hpp
@@ -2,11 +2,12 @@
 #define SF_DAQ_BUFFER_JFJ_FRAMEWORKER_HPP
 
 #include <iostream>
+#include <cstring>
 #include <functional>
 #include "../../core-buffer/include/formats.hpp"
 #include "PacketUdpReceiver.hpp"
 #include "PacketBuffer.hpp"
-#include "FrameStats.hpp"
+#include "JfjFrameStats.hpp"
 
 /** JungfrauJoch UDP receiver
 
diff --git a/jfj-combined/src/JfjFrameWorker.cpp b/jfj-combined/src/JfjFrameWorker.cpp
index e1e198f..9ade8af 100644
--- a/jfj-combined/src/JfjFrameWorker.cpp
+++ b/jfj-combined/src/JfjFrameWorker.cpp
@@ -36,7 +36,7 @@ inline uint64_t JfjFrameWorker::process_packets(BufferBinaryFormat& buffer){
         // Sanity check: rather throw than segfault...
         if(c_packet.packetnum >= JF_N_PACKETS_PER_FRAME) [[unlikely]] {
             std::stringstream ss;
-            ss << "Packet index '" << c_packet.packetnum "' is out of range of " << JF_N_PACKETS_PER_FRAME << std::endl;
+            ss << "Packet index '" << c_packet.packetnum << "' is out of range of " << JF_N_PACKETS_PER_FRAME << std::endl;
             throw std::range_error(ss.str());
         }