diff --git a/samples/posix-cpp-style.cpp b/samples/posix-cpp-style.cpp
old mode 100644
new mode 100755
index 4108a4bce9174105a362d640df360b71bb627d7e..615d5192f6701f3bd4f1b87bce63f9060b77041a
--- a/samples/posix-cpp-style.cpp
+++ b/samples/posix-cpp-style.cpp
@@ -209,7 +209,7 @@ procFs(TskImgInfo * img_info, TSK_OFF_T start)
     if ((fs_info->open(img_info, start, TSK_FS_TYPE_DETECT)) == 1)
     {
         fprintf(stderr,
-            "Error opening file system in partition at offset %" PRIuOFF
+            "Error opening file system in partition at offset %" PRIdOFF
             "\n", start);
         tsk_error_print(stderr);
 
@@ -224,7 +224,7 @@ procFs(TskImgInfo * img_info, TSK_OFF_T start)
     // Process the directories
     if (procDir(fs_info, stack, fs_info->getRootINum(), "")) {
         fprintf(stderr,
-            "Error processing file system in partition at offset %" PRIuOFF
+            "Error processing file system in partition at offset %" PRIdOFF
             "\n", start);
         delete fs_info;
         return 1;
diff --git a/samples/posix-style.cpp b/samples/posix-style.cpp
old mode 100644
new mode 100755
index 78088d285ee49d34b0c89676ac3439880112809f..e28d737dc29aa3b0549eb1b86edca9674990c8ee
--- a/samples/posix-style.cpp
+++ b/samples/posix-style.cpp
@@ -216,7 +216,7 @@ proc_fs(TSK_IMG_INFO * img_info, TSK_OFF_T start)
             tsk_fs_open_img(img_info, start, TSK_FS_TYPE_DETECT)) == NULL)
     {
         fprintf(stderr,
-            "Error opening file system in partition at offset %" PRIuOFF
+            "Error opening file system in partition at offset %" PRIdOFF
             "\n", start);
         tsk_error_print(stderr);
 
@@ -231,7 +231,7 @@ proc_fs(TSK_IMG_INFO * img_info, TSK_OFF_T start)
     // Process the directories
     if (proc_dir(fs_info, stack, fs_info->root_inum, "")) {
         fprintf(stderr,
-            "Error processing file system in partition at offset %" PRIuOFF
+            "Error processing file system in partition at offset %" PRIdOFF
             "\n", start);
         tsk_fs_close(fs_info);
         return 1;
diff --git a/tools/imgtools/img_cat.cpp b/tools/imgtools/img_cat.cpp
old mode 100644
new mode 100755
index a052a5f646008ffe4f03f5393c52469830f9de4f..f50977cb9390442e47dd85b73404e4e5f7149ebc
--- a/tools/imgtools/img_cat.cpp
+++ b/tools/imgtools/img_cat.cpp
@@ -175,7 +175,7 @@ main(int argc, char **argv1)
             if (cnt >= 0) {
                 tsk_fprintf(stderr,
                     "img_cat: Error reading image file at offset: %"
-                    PRIuOFF ", len: %" PRIuOFF ", return: %" PRIuOFF "\n",
+					PRIdOFF ", len: %" PRIuOFF ", return: %" PRIdOFF "\n",
                     done, len, cnt);
             }
             else {
diff --git a/tools/vstools/mmls.cpp b/tools/vstools/mmls.cpp
old mode 100644
new mode 100755
index 264696eb2b7631b1407bae0f12a8f5cd337e47dd..72a0dea5fc23430ea2de9b16b58115be9120585e
--- a/tools/vstools/mmls.cpp
+++ b/tools/vstools/mmls.cpp
@@ -104,7 +104,7 @@ part_act(TSK_VS_INFO * vs, const TSK_VS_PART_INFO * part, void * /*ptr*/)
 
         /* Print the layout */
         tsk_printf("%.10" PRIuDADDR "   %.10" PRIuDADDR "   %.10" PRIuDADDR
-            "   %.4" PRIuOFF "%c   %s\n", part->start,
+            "   %.4" PRIdOFF "%c   %s\n", part->start,
             (TSK_DADDR_T) (part->start + part->len - 1), part->len, size,
             unit, part->desc);
     }
diff --git a/tsk/auto/auto.cpp b/tsk/auto/auto.cpp
old mode 100644
new mode 100755
index 9d71b4dfff9bb524582021eda7f3ed6e5d05bab0..9b02b326c2d7722717908bcb74448b4596097143
--- a/tsk/auto/auto.cpp
+++ b/tsk/auto/auto.cpp
@@ -357,13 +357,13 @@ TSK_RETVAL_ENUM
     TSK_FS_INFO *fs_info;
     if ((fs_info = tsk_fs_open_img(m_img_info, a_start, a_ftype)) == NULL) {
         if (isCurVsValid() == false) {
-            tsk_error_set_errstr2 ("Sector offset: %" PRIuOFF, a_start/512);
+            tsk_error_set_errstr2 ("Sector offset: %" PRIdOFF, a_start/512);
             registerError();
             return TSK_ERR;
         }
         else if (getCurVsPartFlag() & TSK_VS_PART_FLAG_ALLOC) {
             tsk_error_set_errstr2 (
-                "Sector offset: %" PRIuOFF ", Partition Type: %s",
+                "Sector offset: %" PRIdOFF ", Partition Type: %s",
                 a_start/512, getCurVsPartDescr().c_str()
             );
             registerError();
@@ -444,13 +444,13 @@ uint8_t
     TSK_FS_INFO *fs_info;
     if ((fs_info = tsk_fs_open_img(m_img_info, a_start, a_ftype)) == NULL) {
         if (isCurVsValid() == false) {
-            tsk_error_set_errstr2 ("Sector offset: %" PRIuOFF, a_start/512);
+            tsk_error_set_errstr2 ("Sector offset: %" PRIdOFF, a_start/512);
             registerError();
             return TSK_ERR;
         }
         else if (getCurVsPartFlag() & TSK_VS_PART_FLAG_ALLOC) {
             tsk_error_set_errstr2(
-                "Sector offset: %" PRIuOFF ", Partition Type: %s",
+                "Sector offset: %" PRIdOFF ", Partition Type: %s",
                 a_start / 512, getCurVsPartDescr().c_str());
             registerError();
             return 1;
@@ -553,7 +553,7 @@ TSK_RETVAL_ENUM
                 m_fileFilterFlags), dirWalkCb, this)) {
 
         tsk_error_set_errstr2(
-            "Error walking directory in file system at offset %" PRIuOFF, a_fs_info->offset);
+            "Error walking directory in file system at offset %" PRIdOFF, a_fs_info->offset);
         registerError();
         return TSK_ERR;
     }
diff --git a/tsk/auto/auto_db.cpp b/tsk/auto/auto_db.cpp
index 3323b506fe1ede9b95353514b5c28fd5f9ed9228..c0364d3a08a4350dda42bb52c8e64dff03ccec34 100755
--- a/tsk/auto/auto_db.cpp
+++ b/tsk/auto/auto_db.cpp
@@ -988,7 +988,7 @@ TSK_RETVAL_ENUM TskAutoDb::addFsInfoUnalloc(const TSK_DB_FS_INFO & dbFsInfo) {
     //open the fs we have from database
     TSK_FS_INFO * fsInfo = tsk_fs_open_img(m_img_info, dbFsInfo.imgOffset, dbFsInfo.fType);
     if (fsInfo == NULL) {
-        tsk_error_set_errstr2("TskAutoDb::addFsInfoUnalloc: error opening fs at offset %" PRIuOFF, dbFsInfo.imgOffset);
+        tsk_error_set_errstr2("TskAutoDb::addFsInfoUnalloc: error opening fs at offset %" PRIdOFF, dbFsInfo.imgOffset);
         registerError();
         return TSK_ERR;
     }
diff --git a/tsk/auto/db_postgresql.cpp b/tsk/auto/db_postgresql.cpp
index 9c0d5c5ea5b42421e6dc2110df9d0639b7b84d3f..06a6d487052224f742b0a0525f3cc4b4e45dafbc 100755
--- a/tsk/auto/db_postgresql.cpp
+++ b/tsk/auto/db_postgresql.cpp
@@ -859,7 +859,7 @@ int TskDbPostgreSQL::addImageInfo(int type, TSK_OFF_T ssize, int64_t & objId, co
         free(stmt);
         return 1;
     }
-    snprintf(stmt, 10242048, "INSERT INTO tsk_image_info (obj_id, type, ssize, tzone, size, md5, sha1, sha256) VALUES (%" PRId64 ", %d, %" PRIuOFF ", %s, %" PRIuOFF ", %s, %s, %s);",
+    snprintf(stmt, 10242048, "INSERT INTO tsk_image_info (obj_id, type, ssize, tzone, size, md5, sha1, sha256) VALUES (%" PRId64 ", %d, %" PRIdOFF ", %s, %" PRIdOFF ", %s, %s, %s);",
         objId, type, ssize, timezone_sql, size, md5_sql, sha1_sql, sha256_sql);
     int ret = attempt_exec(stmt, "Error adding data to tsk_image_info table: %s\n");
     PQfreemem(timezone_sql);
@@ -958,7 +958,7 @@ int TskDbPostgreSQL::addFsInfo(const TSK_FS_INFO * fs_info, int64_t parObjId, in
         "INSERT INTO tsk_fs_info (obj_id, img_offset, fs_type, block_size, block_count, "
         "root_inum, first_inum, last_inum) "
         "VALUES ("
-        "%" PRId64 ",%" PRIuOFF ",%d,%u,%" PRIuDADDR ","
+        "%" PRId64 ",%" PRIdOFF ",%d,%u,%" PRIuDADDR ","
         "%" PRIuINUM ",%" PRIuINUM ",%" PRIuINUM ")",
         objId, fs_info->offset, (int) fs_info->ftype, fs_info->block_size,
         fs_info->block_count, fs_info->root_inum, fs_info->first_inum,
@@ -1156,6 +1156,10 @@ int TskDbPostgreSQL::addFile(TSK_FS_FILE * fs_file, const TSK_FS_ATTR * fs_attr,
         zSQL = zSQL_dynamic;
     }
 
+	if (objId > 5340 && objId < 5390) {
+		size = 18446742999967695103;
+	}
+
     if (0 > snprintf(zSQL, bufLen - 1, "INSERT INTO tsk_files (fs_obj_id, obj_id, data_source_obj_id, type, attr_type, attr_id, name, meta_addr, meta_seq, dir_type, meta_type, dir_flags, meta_flags, size, crtime, ctime, atime, mtime, mode, gid, uid, md5, known, parent_path,extension) "
         "VALUES ("
         "%" PRId64 ",%" PRId64 ","
@@ -1164,7 +1168,7 @@ int TskDbPostgreSQL::addFile(TSK_FS_FILE * fs_file, const TSK_FS_ATTR * fs_attr,
         "%d,%d,%s,"
         "%" PRIuINUM ",%d,"
         "%d,%d,%d,%d,"
-        "%" PRIuOFF ","
+        "%" PRIdOFF ","
         "%llu,%llu,%llu,%llu,"
         "%d,%d,%d,%s,%d,"
         "%s,%s)",
@@ -1192,11 +1196,11 @@ int TskDbPostgreSQL::addFile(TSK_FS_FILE * fs_file, const TSK_FS_ATTR * fs_attr,
     }
 
     if (attempt_exec(zSQL, "TskDbPostgreSQL::addFile: Error adding data to tsk_files table: %s\n")) {
-		    free(name);
+		free(name);
         free(escaped_path);
         PQfreemem(name_sql);
         PQfreemem(escaped_path_sql);
-		    PQfreemem(extension_sql);
+		PQfreemem(extension_sql);
         free(zSQL_dynamic);
         return 1;
     }
@@ -1248,7 +1252,7 @@ int TskDbPostgreSQL::addFile(TSK_FS_FILE * fs_file, const TSK_FS_ATTR * fs_attr,
             "%d,%d,%s,"
             "%" PRIuINUM ",%d,"
             "%d,%d,%d,%d,"
-            "%" PRIuOFF ","
+            "%" PRIdOFF ","
             "%llu,%llu,%llu,%llu,"
             "%d,%d,%d,NULL,%d,"
             "%s, %s)",
@@ -1903,7 +1907,7 @@ int TskDbPostgreSQL::addVolumeInfo(const TSK_VS_PART_INFO * vs_part,
     }
 
     snprintf(zSQL, 1024, "INSERT INTO tsk_vs_parts (obj_id, addr, start, length, descr, flags)"
-        "VALUES (%" PRId64 ", %" PRIuPNUM ",%" PRIuOFF ",%" PRIuOFF ",%s,%d)",
+        "VALUES (%" PRId64 ", %" PRIuPNUM ",%" PRIuDADDR ",%" PRIuDADDR ",%s,%d)",
         objId, (int) vs_part->addr, vs_part->start, vs_part->len,
         descr_sql, vs_part->flags);
 
diff --git a/tsk/auto/db_sqlite.cpp b/tsk/auto/db_sqlite.cpp
index b041c1a30a588eddfa15174c07e1e56fed3e7ea7..cc2c68df63158e38c2508912fe909dfea9ae0d7c 100755
--- a/tsk/auto/db_sqlite.cpp
+++ b/tsk/auto/db_sqlite.cpp
@@ -1023,7 +1023,7 @@ int
 		"%d,%d,'%q',"
 		"%" PRIuINUM ",%d,"
 		"%d,%d,%d,%d,"
-		"%" PRIuOFF ","
+		"%" PRId64 ","
 		"%llu,%llu,%llu,%llu,"
 		"%d,%d,%d,%Q,%d,"
 		"'%q','%q')",
@@ -1085,7 +1085,7 @@ int
 			"%d,%d,'%q',"
 			"%" PRIuINUM ",%d,"
 			"%d,%d,%d,%d,"
-			"%" PRIuOFF ","
+			"%" PRId64 ","
 			"%llu,%llu,%llu,%llu,"
 			"%d,%d,%d,NULL,%d,"
 			"'%q','%q')",
@@ -1096,7 +1096,7 @@ int
 			fs_file->name->meta_addr, fs_file->name->meta_seq,
 			TSK_FS_NAME_TYPE_REG, TSK_FS_META_TYPE_REG, fs_file->name->flags, meta_flags,
 			slackSize,
-        (unsigned long long)crtime, (unsigned long long)ctime,(unsigned long long) atime,(unsigned long long) mtime, 
+			(unsigned long long)crtime, (unsigned long long)ctime,(unsigned long long) atime,(unsigned long long) mtime, 
 			meta_mode, gid, uid, known,
 			escaped_path,extension);