diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c
index 07aa126d..20bc36b7 100644
--- a/libisoburn/burn_wrap.c
+++ b/libisoburn/burn_wrap.c
@@ -910,14 +910,15 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d,
 
 
 int isoburn_get_msc2(struct isoburn *o,
-                     struct burn_write_opts *opts, int *msc2, int flag)
+                     struct burn_write_opts *opts, off_t *msc2, int flag)
 {
- int ret, lba, nwa;
+ int ret;
+ off_t lba, nwa;
 
  if(o->fabricated_msc2>=0)
    *msc2= o->fabricated_msc2;
  else {
-   ret= isoburn_disc_track_lba_nwa(o->drive, opts, 0, &lba, &nwa);
+   ret= isoburn_disc_track_lba_nwa_v2(o->drive, opts, 0, &lba, &nwa);
    if(ret<=0)
      return(ret);
    *msc2= nwa;
@@ -925,6 +926,7 @@ int isoburn_get_msc2(struct isoburn *o,
  return(1);
 }
 
+
 /* @param flag bit0= truncate (else do not truncate)
                bit1= do not warn if call is inappropriate to drive 
                bit2= only set if truncation is currently enabled
diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c
index c118573e..ddc0905e 100644
--- a/libisoburn/isoburn.c
+++ b/libisoburn/isoburn.c
@@ -405,7 +405,8 @@ int isoburn_make_iso_write_opts(struct isoburn *out_o,
                                 IsoWriteOpts *wopts,
                                 int flag)
 {
- int ret, rec_mtime, new_img, lba, nwa, i, guid_mode;
+ int ret, rec_mtime, new_img, i, guid_mode;
+ off_t lba, nwa;
  struct burn_drive *out_d;
 
  new_img= flag&1;
@@ -508,7 +509,7 @@ int isoburn_make_iso_write_opts(struct isoburn *out_o,
        out_o->min_start_byte= 0;
      }
    }
-   ret = isoburn_disc_track_lba_nwa(out_d, NULL, 0, &lba, &nwa);
+   ret = isoburn_disc_track_lba_nwa_v2(out_d, NULL, 0, &lba, &nwa);
    opts->effective_lba= nwa;
    ret= isoburn_get_msc2(out_o, NULL, &nwa, 0);
    if (ret != 1) {
diff --git a/libisoburn/isoburn.h b/libisoburn/isoburn.h
index 5451bbe8..eea269eb 100644
--- a/libisoburn/isoburn.h
+++ b/libisoburn/isoburn.h
@@ -256,7 +256,7 @@ int isoburn_set_start_byte(struct isoburn *o, off_t value, int flag);
     @return <=0 is failure , >0 success
 */
 int isoburn_get_msc2(struct isoburn *o,
-                     struct burn_write_opts *opts, int *msc2, int flag);
+                     struct burn_write_opts *opts, off_t *msc2, int flag);
 
 /** Get a data source suitable for read from a drive using burn_read_data()
     function.
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index ad5f3c23..600dcdd3 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2024.03.10.075847"
+#define Xorriso_timestamP "2024.03.10.101203"