diff --git a/src/Aggregator.hs b/src/Aggregator.hs
index 0165ff6..4a160dc 100644
--- a/src/Aggregator.hs
+++ b/src/Aggregator.hs
@@ -52,7 +52,7 @@ newtype Window = Window (Set Word32) -- thread ids that have joined the window
 
 {-# INLINE translateThreadEvents #-}
 translateThreadEvents :: Fold IO Event [Event]
-translateThreadEvents = Fold step initial extract
+translateThreadEvents = Fold step initial extract extract
 
     where
 
@@ -204,7 +204,7 @@ data CollectState =
 collectThreadCounter ::
     Fold IO ((Word32, String, Counter), (Location, Int64))
     (Maybe (Either (Maybe Int64) Int64))
-collectThreadCounter = Fold step initial extract
+collectThreadCounter = Fold step initial extract extract
 
     where
 
diff --git a/src/EventParser.hs b/src/EventParser.hs
index e345ba6..dd60935 100644
--- a/src/EventParser.hs
+++ b/src/EventParser.hs
@@ -19,7 +19,8 @@ import Streamly.Data.Parser (Parser)
 import Streamly.Data.ParserK (ParserK)
 import Streamly.Data.Stream (Stream)
 import Streamly.Data.StreamK (StreamK)
-import Streamly.Internal.Serialize.FromBytes (int16be, word16be, word32be, word64be)
+import Streamly.Internal.Data.Binary.Parser
+    (int16be, word16be, word32be, word64be)
 
 import qualified Data.IntMap as Map
 import qualified Streamly.Data.Array as Array