diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c
index e0d17a16..de8c4a68 100644
--- a/libisoburn/burn_wrap.c
+++ b/libisoburn/burn_wrap.c
@@ -770,7 +770,7 @@ int isoburn__sev_to_text(int severity, char **severity_name,
 #endif
    
 #ifdef Libisoburn_on_libisofs_after_0_6_2
-  ret= iso_sev_to_text(severity, severity_name, 0);
+  ret= iso_sev_to_text(severity, severity_name);
   if(ret>0)
     return(ret);
 #endif /*  Libisoburn_on_libisofs_after_0_6_2 */
@@ -824,16 +824,12 @@ int isoburn__text_to_sev(char *severity_name, int *severity_number, int flag)
  int ret= 1;
 
 #ifdef Libisoburn_on_libisofs_after_0_6_2
-  ret= iso_text_to_sev(severity_name, severity_number, 0);
+  ret= iso_text_to_sev(severity_name, severity_number);
   if(ret>0)
     return(ret);
 #endif /*  Libisoburn_on_libisofs_after_0_6_2 */
-#ifdef Libisoburn_on__libburn_after_0_4_2
-  ret= burn_text_to_sev(severity_name, severity_number, 0);
-  if(ret>0)
-    return(ret);
-#endif
 
+#ifndef Libisoburn_on__libburn_after_0_4_2
  if(severity_name[0]==0)
    *severity_number= 0;
  else if(strcmp(severity_name, "MISHAP")==0)
@@ -841,6 +837,8 @@ int isoburn__text_to_sev(char *severity_name, int *severity_number, int flag)
  else if(strcmp(severity_name, "ERRFILE")==0)
    *severity_number= LIBDAX_MSGS_SEV_ERRFILE;
  else
+#endif /* ! Libisoburn_on__libburn_after_0_4_2 */
+
    ret= burn_text_to_sev(severity_name, severity_number, 0);
  return(ret);
 }
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 12519bc8..65a4dee5 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.02.23.131825"
+#define Xorriso_timestamP "2008.02.25.174229"
diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c
index 1e8a46ad..ccded134 100644
--- a/xorriso/xorrisoburn.c
+++ b/xorriso/xorrisoburn.c
@@ -276,7 +276,7 @@ int Xorriso__sev_to_text(int severity, char **severity_name,
 #endif
 
 #ifdef Xorriso_on_libisofs_after_0_6_2
-  ret= iso_sev_to_text(severity, severity_name, 0);
+  ret= iso_sev_to_text(severity, severity_name);
   if(ret>0)
     return(ret);
 #endif /*  Xorriso_on_libisofs_after_0_6_2 */
@@ -330,16 +330,12 @@ int Xorriso__text_to_sev(char *severity_name, int *severity_number, int flag)
  int ret= 1;
 
 #ifdef Xorriso_on_libisofs_after_0_6_2
-  ret= iso_text_to_sev(severity_name, severity_number, 0);
-  if(ret>0)
-    return(ret);
+ ret= iso_text_to_sev(severity_name, severity_number);
+ if(ret>0)
+   return(ret);
 #endif /*  Xorriso_on_libisofs_after_0_6_2 */
-#ifdef Xorriso_on_libburn_after_0_4_2
-  ret= burn_text_to_sev(severity_name, severity_number, 0);
-  if(ret>0)
-    return(ret);
-#endif
 
+#ifndef Xorriso_on_libburn_after_0_4_2
  if(severity_name[0]==0)
    *severity_number= 0;
  else if(strcmp(severity_name, "MISHAP")==0)
@@ -347,6 +343,8 @@ int Xorriso__text_to_sev(char *severity_name, int *severity_number, int flag)
  else if(strcmp(severity_name, "ERRFILE")==0)
    *severity_number= LIBDAX_MSGS_SEV_ERRFILE;
  else
+#endif /* ! Xorriso_on_libburn_after_0_4_2 */
+
    ret= burn_text_to_sev(severity_name, severity_number, 0);
  return(ret);
 }
@@ -393,7 +391,7 @@ int Xorriso_report_iso_error(struct XorrisO *xorriso, char *victim,
 }
 
 
-/* @param flag bit0= suppress messages below DEBUG
+/* @param flag bit0= suppress messages below UPDATE
                bit1= suppress messages below FAILURE
 */
 int Xorriso_set_image_severities(struct XorrisO *xorriso, int flag)