diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c
index 76103f00..906053b9 100644
--- a/xorriso/drive_mgt.c
+++ b/xorriso/drive_mgt.c
@@ -172,7 +172,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
  size_t value_length;
  char *value= NULL;
  double num;
- char volid[33], *adr_data, *adr_pt;
+ char volid[33], *adr_data= NULL, *adr_pt;
 
  Xorriso_alloc_meM(libburn_adr, char, SfileadrL);
  Xorriso_alloc_meM(adr_data, char, 163);
diff --git a/xorriso/emulators.c b/xorriso/emulators.c
index 8641cc53..a98c818e 100644
--- a/xorriso/emulators.c
+++ b/xorriso/emulators.c
@@ -144,11 +144,11 @@ static char blank_help[][80]= {
 "@End_of_helptexT@"
 };
 
+ mem_do_close= xorriso->do_close;
  Xorriso_alloc_meM(track_source, char, SfileadrL);
  Xorriso_alloc_meM(dev_adr, char, SfileadrL);
 
  strcpy(mem_report_about_text, xorriso->report_about_text);
- mem_do_close= xorriso->do_close;
 
  track_source[0]= 0;
  dev_adr[0]= 0;
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 00ca5ed9..3a138619 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.05.04.151820"
+#define Xorriso_timestamP "2011.05.04.152314"