diff --git a/libisoburn/data_source.c b/libisoburn/data_source.c
index ccb83caf..90bf48b8 100644
--- a/libisoburn/data_source.c
+++ b/libisoburn/data_source.c
@@ -273,7 +273,7 @@ static int isoburn_cached_drive_new(struct isoburn_cached_drive **o,
  int i, ret;
 
  *o = icd = calloc(1,sizeof(struct isoburn_cached_drive));
- if (o == NULL)
+ if (*o == NULL)
    return(-1);
  icd->drive = d;
  icd->tiles = NULL;
diff --git a/libisoburn/isofs_wrap.c b/libisoburn/isofs_wrap.c
index ec48a91c..b6ea236b 100644
--- a/libisoburn/isofs_wrap.c
+++ b/libisoburn/isofs_wrap.c
@@ -204,7 +204,7 @@ create_blank_image:;
      iso_image_set_ignore_aclea(o->image,
                          (!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) );
 
-     ret= isoburn_root_defaults(*image, 0);
+     ret= isoburn_root_defaults(o->image, 0);
      if(ret <= 0)
        goto ex;
    }
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 5095835c..413f8a5e 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2012.03.21.141040"
+#define Xorriso_timestamP "2012.03.21.193055"