diff --git a/Specter/src/Specter/Physics/nscldaq/CharonOnlineSource.cpp b/Specter/src/Specter/Physics/nscldaq/CharonOnlineSource.cpp
index 5d63070..0c5fb69 100644
--- a/Specter/src/Specter/Physics/nscldaq/CharonOnlineSource.cpp
+++ b/Specter/src/Specter/Physics/nscldaq/CharonOnlineSource.cpp
@@ -37,7 +37,7 @@ namespace Specter {
     void CharonOnlineSource::UnpackRawBuffer()
     {
         uint32_t* iter = (uint32_t*) m_rawBuffer.data();
-        uint32_t* end = iter + m_rawBuffer.size();
+        uint32_t* end = iter + m_rawBuffer.size() / sizeof(uint32_t);
         bool wasUnpacked = false;
 
         UnpackerResult result;
diff --git a/Specter/src/Specter/Physics/nscldaq/Unpackers/MesyTecUnpacker.h b/Specter/src/Specter/Physics/nscldaq/Unpackers/MesyTecUnpacker.h
index f8d7a5a..d574262 100644
--- a/Specter/src/Specter/Physics/nscldaq/Unpackers/MesyTecUnpacker.h
+++ b/Specter/src/Specter/Physics/nscldaq/Unpackers/MesyTecUnpacker.h
@@ -22,7 +22,7 @@ namespace Specter {
 
         virtual void UnpackDatum(uint32_t* word) override;
 
-        static constexpr uint32_t s_typeMask = 0xc000000;
+        static constexpr uint32_t s_typeMask = 0xc0000000;
         static constexpr uint32_t s_typeHeader = 0x40000000;
         static constexpr uint32_t s_typeBody = 0x00000000;
         static constexpr uint32_t s_typeEnd = 0xc0000000;