diff --git a/src/ecma119.c b/src/ecma119.c
index 1715423..ef52d6e 100644
--- a/src/ecma119.c
+++ b/src/ecma119.c
@@ -630,7 +630,7 @@ int ecma119_image_new(IsoImage *src, Ecma119WriteOpts *opts,
     iso_image_ref(src);
     
     target->iso_level = opts->level;
-    target->omit_version_numbers = 0; //TODO
+    target->omit_version_numbers = opts->omit_version_numbers;
     target->sort_files = opts->sort_files;
     
     target->now = time(NULL);
diff --git a/src/ecma119_tree.c b/src/ecma119_tree.c
index bab27ee..60e368f 100644
--- a/src/ecma119_tree.c
+++ b/src/ecma119_tree.c
@@ -32,8 +32,7 @@ int get_iso_name(Ecma119Image *img, IsoNode *iso, char **name)
         return ISO_SUCCESS;
     }
 
-    // TODO add support for other input charset
-    ret = str2ascii("UTF-8", iso->name, &ascii_name);
+    ret = str2ascii(img->input_charset, iso->name, &ascii_name);
     if (ret < 0) {
         iso_msg_debug(img->image, "Can't convert %s", iso->name);
         return ret;
diff --git a/src/libisofs.h b/src/libisofs.h
index a2783e9..bda1e8d 100644
--- a/src/libisofs.h
+++ b/src/libisofs.h
@@ -62,6 +62,9 @@ typedef struct {
     //int volnum; /**< The volume in the set which you want to write (usually 0) */
     int level;  /**< ISO level to write at. */
     int flags;  /**< Which extensions to support. */
+    
+    /* relaxed constraints */
+    unsigned int omit_version_numbers:1;
     //int relaxed_constraints; /**< see ecma119_relaxed_constraints_flag */
     
     //unsigned int copy_eltorito:1;