diff --git a/lfs.c b/lfs.c
index bea048c6..6aa5320f 100644
--- a/lfs.c
+++ b/lfs.c
@@ -1311,6 +1311,10 @@ static lfs_ssize_t lfsr_rbyd_readtag(lfs_t *lfs,
     }
     delta += delta_;
 
+    if (id_ > 0x7fffffff) {
+        return LFS_ERR_CORRUPT;
+    }
+
     lfs_size_t size_;
     delta_ = lfs_fromleb128(&size_, &buffer[delta], 5);
     if (delta_ < 0) {
@@ -1318,6 +1322,10 @@ static lfs_ssize_t lfsr_rbyd_readtag(lfs_t *lfs,
     }
     delta += delta_;
 
+    if (size_ > 0x7fffffff) {
+        return LFS_ERR_CORRUPT;
+    }
+
     // optionally crc
     if (crc) {
         *crc = lfs_crc32c(*crc, buffer, delta);
@@ -1387,9 +1395,7 @@ static int lfsr_rbyd_fetch(lfs_t *lfs, lfsr_rbyd_t *rbyd,
                 NULL, &lfs->rcache, limit-off,
                 block, off, &tag, &id, &size, &crc);
         if (delta < 0) {
-            if (delta == LFS_ERR_INVAL
-                    || delta == LFS_ERR_CORRUPT
-                    || delta == LFS_ERR_OVERFLOW) {
+            if (delta == LFS_ERR_INVAL || delta == LFS_ERR_CORRUPT) {
                 maybeerased = maybeerased && delta == LFS_ERR_INVAL;
                 break;
             }
@@ -1846,6 +1852,10 @@ static int lfsr_rbyd_progdata(lfs_t *lfs, lfsr_rbyd_t *rbyd_,
 
 static int lfsr_rbyd_progtag(lfs_t *lfs, lfsr_rbyd_t *rbyd_,
         lfsr_tag_t tag, lfs_ssize_t id, lfs_size_t size, uint32_t *crc) {
+    // check for underflow issues
+    LFS_ASSERT((lfs_size_t)(id+1) < 0x80000000);
+    LFS_ASSERT(size < 0x80000000);
+
     // make sure to include the parity of the current crc
     tag |= lfs_popc(rbyd_->crc) & 1;
 
diff --git a/lfs.h b/lfs.h
index 2e7e26d7..a1220490 100644
--- a/lfs.h
+++ b/lfs.h
@@ -88,8 +88,6 @@ enum lfs_error {
     LFS_ERR_NOATTR      = -61,  // No data/attr available
     LFS_ERR_NAMETOOLONG = -36,  // File name too long
     LFS_ERR_RANGE       = -34,  // Result out of range
-    // TODO should all overflow errors actually be corrupt errors?
-    LFS_ERR_OVERFLOW    = -75,  // Value too large for defined data type
 };
 
 // File types
diff --git a/lfs_util.c b/lfs_util.c
index 87207f22..e730864c 100644
--- a/lfs_util.c
+++ b/lfs_util.c
@@ -30,7 +30,7 @@ ssize_t lfs_toleb128(uint32_t word, void *buffer, size_t size) {
         }
     }
 
-    return LFS_ERR_OVERFLOW;
+    return LFS_ERR_CORRUPT;
 }
 
 ssize_t lfs_fromleb128(uint32_t *word, const void *buffer, size_t size) {
@@ -46,7 +46,7 @@ ssize_t lfs_fromleb128(uint32_t *word, const void *buffer, size_t size) {
         }
     }
 
-    return LFS_ERR_OVERFLOW;
+    return LFS_ERR_CORRUPT;
 }