diff --git a/tools/autotools/tsk_comparedir.cpp b/tools/autotools/tsk_comparedir.cpp
index 95b76a8a60211adc328a76a2c031c18b36c30e2f..0ab30faf86af0add76f97ad1d4d858f7f2bbfbf1 100644
--- a/tools/autotools/tsk_comparedir.cpp
+++ b/tools/autotools/tsk_comparedir.cpp
@@ -347,7 +347,7 @@ main(int argc, char **argv1)
     unsigned int ssize = 0;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = "";
     
 #ifdef WIN32
@@ -475,7 +475,7 @@ main(int argc, char **argv1)
         exit(1);
     }
 
-    if (tskCompareDir.openFs(soffset, fstype, pooltype, pvol_block)) {
+    if (tskCompareDir.openFs(soffset, fstype, pooltype, (TSK_DADDR_T)pvol_block)) {
         // Errors were already logged
         exit(1);
     }
diff --git a/tools/autotools/tsk_recover.cpp b/tools/autotools/tsk_recover.cpp
index 23235458f1b90edb6ae96b8fb0449e8b380b8bad..997bd60d574aa497a80e6b65bb011a762a1b0f72 100755
--- a/tools/autotools/tsk_recover.cpp
+++ b/tools/autotools/tsk_recover.cpp
@@ -415,7 +415,7 @@ main(int argc, char **argv1)
     TSK_IMG_TYPE_ENUM imgtype = TSK_IMG_TYPE_DETECT;
     TSK_FS_TYPE_ENUM fstype = TSK_FS_TYPE_DETECT;
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     int ch;
     TSK_TCHAR **argv;
     unsigned int ssize = 0;
@@ -556,7 +556,7 @@ main(int argc, char **argv1)
         exit(1);
     }
     
-    if (tskRecover.openFs(soffset, fstype, pooltype, pvol_block)) {
+    if (tskRecover.openFs(soffset, fstype, pooltype, (TSK_DADDR_T)pvol_block)) {
         // Errors were already logged
         exit(1);
     }
diff --git a/tools/fstools/blkcalc.cpp b/tools/fstools/blkcalc.cpp
index 0ce7176d5b55eb51deee0584b4ae5581301a8b65..9307d79a1735625109c5d5b2511a0e4db603f146 100644
--- a/tools/fstools/blkcalc.cpp
+++ b/tools/fstools/blkcalc.cpp
@@ -72,7 +72,7 @@ main(int argc, char **argv1)
     TSK_FS_INFO *fs;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = "";
 
     int ch;
@@ -262,7 +262,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/blkcat.cpp b/tools/fstools/blkcat.cpp
index a01e9eac8bb8f2b646e8969709df73b4ab7db720..609e58a25412194bf6babcb39be72d00c4de70fa 100644
--- a/tools/fstools/blkcat.cpp
+++ b/tools/fstools/blkcat.cpp
@@ -73,7 +73,7 @@ main(int argc, char **argv1)
     TSK_FS_INFO *fs;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = "";
 
     TSK_DADDR_T addr = 0;
@@ -323,7 +323,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/blkls.cpp b/tools/fstools/blkls.cpp
index 3321228dc2b1fbb6b9081e5a7b8ccc3a3a65992f..bf8aa2e367587164dac2854d05bab99caf5ab404 100644
--- a/tools/fstools/blkls.cpp
+++ b/tools/fstools/blkls.cpp
@@ -80,7 +80,7 @@ main(int argc, char **argv1)
     TSK_FS_INFO *fs;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = "";
 
     TSK_TCHAR *cp, *dash;
@@ -248,7 +248,7 @@ main(int argc, char **argv1)
                 exit(1);
             }
 
-            img = pool->get_img_info(pool, pvol_block);
+            img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
             if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
                 tsk_error_print(stderr);
                 if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
@@ -364,7 +364,7 @@ main(int argc, char **argv1)
                 exit(1);
             }
 
-            img = pool->get_img_info(pool, pvol_block);
+            img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
             if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
                 tsk_error_print(stderr);
                 if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/blkstat.cpp b/tools/fstools/blkstat.cpp
index 3a512b46316c9c180c0e342dd465d69de69b7dcb..f816ee164dfcf257b747be451843598598e541c7 100644
--- a/tools/fstools/blkstat.cpp
+++ b/tools/fstools/blkstat.cpp
@@ -57,7 +57,7 @@ main(int argc, char **argv1)
     TSK_FS_INFO *fs;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = "";
 
     int ch;
@@ -200,7 +200,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/fcat.cpp b/tools/fstools/fcat.cpp
index eec431d490e75a61b3ad65f2c6d42e665e06a587..0e7e72b7b0e345c5fef4e158c1ce12944c0d7cc0 100644
--- a/tools/fstools/fcat.cpp
+++ b/tools/fstools/fcat.cpp
@@ -55,7 +55,7 @@ main(int argc, char **argv1)
     TSK_FS_INFO *fs;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = ""; // Not currently used
 
     TSK_INUM_T inum;
@@ -214,7 +214,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/ffind.cpp b/tools/fstools/ffind.cpp
index f3c0fed1280aeb7e0b1dd21b724ce3bf19f51a03..d9565bc4e2413e60768491ea91d1c1a342258e52 100644
--- a/tools/fstools/ffind.cpp
+++ b/tools/fstools/ffind.cpp
@@ -63,7 +63,7 @@ main(int argc, char **argv1)
     TSK_FS_INFO *fs;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = ""; // Not currently used
 
     int dir_walk_flags = TSK_FS_DIR_WALK_FLAG_RECURSE;
@@ -231,7 +231,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/fls.cpp b/tools/fstools/fls.cpp
index ece240bee9746adcadfdb23a295d4c947ebc1968..41676b0b249f5ddbd4e3fa05edb46529b36cd563 100644
--- a/tools/fstools/fls.cpp
+++ b/tools/fstools/fls.cpp
@@ -96,8 +96,8 @@ main(int argc, char **argv1)
     TSK_TCHAR *cp;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
-    TSK_DADDR_T snap_id = 0;
+    TSK_OFF_T pvol_block = 0;
+    TSK_OFF_T snap_id = 0;
 
 #ifdef TSK_WIN32
     // On Windows, get the wide arguments (mingw doesn't support wmain)
@@ -330,7 +330,7 @@ main(int argc, char **argv1)
                 exit(1);
             }
 
-            img = pool->get_img_info(pool, pvol_block);
+            img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
             if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
                 tsk_error_print(stderr);
                 if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
@@ -382,7 +382,7 @@ main(int argc, char **argv1)
                 exit(1);
             }
 
-            img = pool->get_img_info(pool, pvol_block);
+            img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
             if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
                 tsk_error_print(stderr);
                 if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
@@ -394,7 +394,7 @@ main(int argc, char **argv1)
     }
 
     if (snap_id > 0) {
-        tsk_apfs_set_snapshot(fs, snap_id);
+        tsk_apfs_set_snapshot(fs, (uint64_t)snap_id);
     }
 
     if (tsk_fs_fls(fs, (TSK_FS_FLS_FLAG_ENUM) fls_flags, inode,
diff --git a/tools/fstools/fsstat.cpp b/tools/fstools/fsstat.cpp
index fcdae9e53dcbf4d1f36c9bb2b3845eec2ddf79c9..ca6a6a01494b42c8158f055e93589c95131b51c3 100644
--- a/tools/fstools/fsstat.cpp
+++ b/tools/fstools/fsstat.cpp
@@ -57,7 +57,7 @@ main(int argc, char **argv1)
     const char * password = "";
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
 
     int ch;
     uint8_t type = 0;
@@ -210,7 +210,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/icat.cpp b/tools/fstools/icat.cpp
index 2f6622cf2ec7ca3f1821315f670114f2c5d8d686..b1656dc1d8ab343d514e2c3b5e57de7a7b7c0f85 100644
--- a/tools/fstools/icat.cpp
+++ b/tools/fstools/icat.cpp
@@ -73,8 +73,8 @@ main(int argc, char **argv1)
     const char * password = "";
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
-    TSK_DADDR_T snap_id = 0;
+    TSK_OFF_T pvol_block = 0;
+    TSK_OFF_T snap_id = 0;
 
     TSK_INUM_T inum;
     int fw_flags = 0;
@@ -249,7 +249,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
@@ -277,7 +277,7 @@ main(int argc, char **argv1)
     }
 
     if (snap_id > 0) {
-        tsk_apfs_set_snapshot(fs, snap_id);
+        tsk_apfs_set_snapshot(fs, (uint64_t)snap_id);
     }
 
     retval =
diff --git a/tools/fstools/ifind.cpp b/tools/fstools/ifind.cpp
index 713a9c8c5ab50bc1bc5a369ebfbf8319898e8425..59040dc0ea37cf012a8d8aad1ddafa9afdd356ef 100644
--- a/tools/fstools/ifind.cpp
+++ b/tools/fstools/ifind.cpp
@@ -77,7 +77,7 @@ main(int argc, char **argv1)
     uint8_t type = 0;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = ""; // Not currently used
 
     int ch;
@@ -291,7 +291,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/ils.cpp b/tools/fstools/ils.cpp
index 8116ef115f36bc02e4ff9c3fe94be305bbf1358b..22a6087daf993eda6317ccdefd2a3ef62d872711 100644
--- a/tools/fstools/ils.cpp
+++ b/tools/fstools/ils.cpp
@@ -81,7 +81,7 @@ main(int argc, char **argv1)
     TSK_FS_INFO *fs;
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
+    TSK_OFF_T pvol_block = 0;
     const char * password = ""; // Not currently used
 
     TSK_TCHAR *cp, *dash;
@@ -367,7 +367,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
diff --git a/tools/fstools/istat.cpp b/tools/fstools/istat.cpp
index 75fb6c4b6dcfb64ce6cb59c88f5b3e6818c7acdf..42b7928a858db04d0c978a23223817d2351fce02 100644
--- a/tools/fstools/istat.cpp
+++ b/tools/fstools/istat.cpp
@@ -72,8 +72,8 @@ main(int argc, char **argv1)
     const char * password = "";
 
     TSK_POOL_TYPE_ENUM pooltype = TSK_POOL_TYPE_DETECT;
-    TSK_DADDR_T pvol_block = 0;
-    TSK_DADDR_T snap_id = 0;
+    TSK_OFF_T pvol_block = 0;
+    TSK_OFF_T snap_id = 0;
 
     TSK_INUM_T inum;
     int ch;
@@ -268,7 +268,7 @@ main(int argc, char **argv1)
             exit(1);
         }
 
-        img = pool->get_img_info(pool, pvol_block);
+        img = pool->get_img_info(pool, (TSK_DADDR_T)pvol_block);
         if ((fs = tsk_fs_open_img_decrypt(img, imgaddr * img->sector_size, fstype, password)) == NULL) {
             tsk_error_print(stderr);
             if (tsk_error_get_errno() == TSK_ERR_FS_UNSUPTYPE)
@@ -297,7 +297,7 @@ main(int argc, char **argv1)
     }
 
     if (snap_id > 0) {
-      tsk_apfs_set_snapshot(fs, snap_id);
+      tsk_apfs_set_snapshot(fs, (uint64_t)snap_id);
     }
 
     if (fs->istat(fs, (TSK_FS_ISTAT_FLAG_ENUM) istat_flags, stdout, inum, numblock, sec_skew)) {