diff --git a/libisoburn/trunk/ng_src/burn_wrap.c b/libisoburn/trunk/ng_src/burn_wrap.c
index cae78ba5..015e2aec 100644
--- a/libisoburn/trunk/ng_src/burn_wrap.c
+++ b/libisoburn/trunk/ng_src/burn_wrap.c
@@ -25,11 +25,21 @@
 #include <fcntl.h>
 
 
+#ifndef Xorriso_standalonE
+
 #include <libburn/libburn.h>
 
 /* >>> NG */
 #include <libisofs/nglibisofs.h>
 
+#else /* ! Xorriso_standalonE */
+
+#include "../libisofs/libisofs.h"
+#include "../libburn/libburn.h"
+
+#endif /* Xorriso_standalonE */
+
+
 #include "libisoburn.h"
 #include "isoburn.h"
 
@@ -270,6 +280,7 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d,
  return(1);
 #endif
 
+ *nwa= *lba= 0;
  ret= isoburn_find_emulator(&o, d, 0);
  if(ret<0)
    return(0);
@@ -278,6 +289,8 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d,
    *nwa= o->nwa;
    return(1);
  }
+ if(burn_drive_get_drive_role(d) != 1)
+   return(1);
  return(burn_disc_track_lba_nwa(d, opts, trackno, lba, nwa));
 }
 
diff --git a/libisoburn/trunk/ng_src/data_source.c b/libisoburn/trunk/ng_src/data_source.c
index 5fd18aed..540f1ee2 100644
--- a/libisoburn/trunk/ng_src/data_source.c
+++ b/libisoburn/trunk/ng_src/data_source.c
@@ -7,13 +7,23 @@
 #include <assert.h>
 #include <stdlib.h>
 
+
+#ifndef Xorriso_standalonE
+
 #include <libburn/libburn.h>
 
 /* >>> NG */
 #include <libisofs/nglibisofs.h>
 
-#include "isoburn.h"
+#else /* ! Xorriso_standalonE */
 
+#include "../libisofs/libisofs.h"
+#include "../libburn/libburn.h"
+
+#endif /* Xorriso_standalonE */
+
+
+#include "isoburn.h"
 
 static int 
 ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
diff --git a/libisoburn/trunk/ng_src/isoburn.c b/libisoburn/trunk/ng_src/isoburn.c
index ef5f835b..70153776 100644
--- a/libisoburn/trunk/ng_src/isoburn.c
+++ b/libisoburn/trunk/ng_src/isoburn.c
@@ -19,11 +19,21 @@
 #include <errno.h>
 #include <unistd.h>
 
+#ifndef Xorriso_standalonE
+
 #include <libburn/libburn.h>
 
 /* >>> NG */
 #include <libisofs/nglibisofs.h>
 
+#else /* ! Xorriso_standalonE */
+
+#include "../libisofs/libisofs.h"
+#include "../libburn/libburn.h"
+
+#endif /* Xorriso_standalonE */
+
+
 #include "libisoburn.h"
 #include "isoburn.h"
 
diff --git a/libisoburn/trunk/ng_src/isofs_wrap.c b/libisoburn/trunk/ng_src/isofs_wrap.c
index c586220a..49e42b0e 100644
--- a/libisoburn/trunk/ng_src/isofs_wrap.c
+++ b/libisoburn/trunk/ng_src/isofs_wrap.c
@@ -12,13 +12,22 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+
+#ifndef Xorriso_standalonE
 
 #include <libburn/libburn.h>
 
 /* >>> NG */
 #include <libisofs/nglibisofs.h>
 
+#else /* ! Xorriso_standalonE */
+
+#include "../libisofs/libisofs.h"
+#include "../libburn/libburn.h"
+
+#endif /* Xorriso_standalonE */
+
+
 #include "isoburn.h"
 #include "libisoburn.h"
 
@@ -247,14 +256,15 @@ int isoburn_start_emulation(struct isoburn *o, int flag)
  struct burn_drive *drive;
  struct ecma119_pri_vol_desc *pvm;
  
- assert(o);
+ if(o==NULL)
+   return -1;
 
  drive= o->drive;
 
  /* we can assume 0 as start block for image */
  /* TODO what about ms? where we validate valid iso image in ms disc? */
  ret = burn_read_data(drive, (off_t) 0, (char*)o->target_iso_head, 
-                      sizeof(o->target_iso_head), &data_count, 1);
+                      sizeof(o->target_iso_head), &data_count, 2);
 
  /* an error means an empty disc */
  if (ret <= 0) {
diff --git a/libisoburn/trunk/test/xorriso_timestamp.h b/libisoburn/trunk/test/xorriso_timestamp.h
index f58074b2..19211539 100644
--- a/libisoburn/trunk/test/xorriso_timestamp.h
+++ b/libisoburn/trunk/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.01.19.162244"
+#define Xorriso_timestamP "2008.01.20.102946"