diff --git a/src/Data/Store/Core.hs b/src/Data/Store/Core.hs
--- a/src/Data/Store/Core.hs
+++ b/src/Data/Store/Core.hs
@@ -441,7 +441,6 @@
 #else
               runPeek mypeek (PeekState end) ptr
 #endif
-        -- TODO: consider moving this condition to before running the peek?
           if len > remaining -- Do not perform the check on the new pointer, since it could have overflowed
               then throwIO $ PeekException (end `minusPtr` ptr2) "Overshot end of buffer"
               else return (ptr2 `minusPtr` ptr, x')
@@ -478,8 +477,6 @@
     return (newOffset, ())
 {-# INLINE pokeStorable #-}
 
--- FIXME: make it the responsibility of the caller to check this.
-
 -- | A 'peek' implementation based on an instance of 'Storable' and
 -- 'Typeable'.
 peekStorable :: forall a. (Storable a, Typeable a) => Peek a
@@ -560,8 +557,6 @@
                   len
         let !newOffset = targetOffset + len
         return (newOffset, ())
-
--- TODO: have a safer variant with the check?
 
 -- | Copy a section of memory, based on a 'ByteArray#', to the output.
 -- Note that this operation is unsafe, because the offset and length
diff --git a/store-core.cabal b/store-core.cabal
--- a/store-core.cabal
+++ b/store-core.cabal
@@ -1,13 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.33.0.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 4d5b37ad0ce1ceba6aa2cb51c1cd7c7c5d2aa2f0f10374478d0909fddf0548a4
 
 name:           store-core
-version:        0.4.4.4
+version:        0.4.4.5
 synopsis:       Fast and lightweight binary serialization
 category:       Serialization, Data
 homepage:       https://github.com/fpco/store#readme
@@ -17,6 +15,15 @@
 license:        MIT
 license-file:   LICENSE
 build-type:     Simple
+tested-with:
+    GHC==9.0.1
+  , GHC==8.10.4
+  , GHC==8.8.4
+  , GHC==8.6.5
+  , GHC==8.4.4
+  , GHC==8.2.2
+  , GHC==8.0.2
+  , GHC==7.10.3
 extra-source-files:
     ChangeLog.md
 
@@ -41,11 +48,11 @@
     , bytestring >=0.10.4.0 && <1.0
     , ghc-prim >=0.3.1.0 && <1.0
     , primitive >=0.6 && <1.0
-    , text >=1.2.0.4 && <2.0
+    , text >=1.2.0.4 && <1.3 || >=2.0 && <2.1
     , transformers >=0.3.0.0 && <1.0
+  default-language: Haskell2010
   if flag(force-alignment) || arch(PPC) || arch(PPC64) || arch(Mips) || arch(Sparc) || arch(Arm)
     cpp-options: -DALIGNED_MEMORY
   if impl(ghc < 8.0)
     build-depends:
         fail >=4.9
-  default-language: Haskell2010