diff --git a/objects/button_power_obj.c b/objects/button_power_obj.c
index d0b0001..6dbd5c3 100644
--- a/objects/button_power_obj.c
+++ b/objects/button_power_obj.c
@@ -98,8 +98,11 @@
 {
   GMainLoop *loop;
 
+  cmdline cmd;
+  cmd.argc = argc;
+  cmd.argv = argv;
+
   guint id;
-  //g_type_init ();
   loop = g_main_loop_new (NULL, FALSE);
 
   id = g_bus_own_name (G_BUS_TYPE_SESSION,
@@ -109,7 +112,7 @@
                        on_bus_acquired,
                        on_name_acquired,
                        on_name_lost,
-                       loop,
+                       &cmd,
                        NULL);
 
   g_main_loop_run (loop);
diff --git a/objects/chassis_identify_obj.c b/objects/chassis_identify_obj.c
index e01225c..b8d50e0 100644
--- a/objects/chassis_identify_obj.c
+++ b/objects/chassis_identify_obj.c
@@ -111,9 +111,11 @@
 main (gint argc, gchar *argv[])
 {
   GMainLoop *loop;
+  cmdline cmd;
+  cmd.argc = argc;
+  cmd.argv = argv;
 
   guint id;
-  //g_type_init ();
   loop = g_main_loop_new (NULL, FALSE);
 
   id = g_bus_own_name (G_BUS_TYPE_SESSION,
@@ -123,7 +125,7 @@
                        on_bus_acquired,
                        on_name_acquired,
                        on_name_lost,
-                       loop,
+                       &cmd,
                        NULL);
 
   g_main_loop_run (loop);
diff --git a/objects/control_host_obj.c b/objects/control_host_obj.c
index 5809576..b9d0bc7 100644
--- a/objects/control_host_obj.c
+++ b/objects/control_host_obj.c
@@ -145,9 +145,11 @@
 main (gint argc, gchar *argv[])
 {
   GMainLoop *loop;
+  cmdline cmd;
+  cmd.argc = argc;
+  cmd.argv = argv;
 
   guint id;
-  //g_type_init ();
   loop = g_main_loop_new (NULL, FALSE);
 
   id = g_bus_own_name (G_BUS_TYPE_SESSION,
@@ -157,7 +159,7 @@
                        on_bus_acquired,
                        on_name_acquired,
                        on_name_lost,
-                       loop,
+                       &cmd,
                        NULL);
 
   g_main_loop_run (loop);
diff --git a/objects/flash_bios_obj.c b/objects/flash_bios_obj.c
index f74ce90..bc5c070 100644
--- a/objects/flash_bios_obj.c
+++ b/objects/flash_bios_obj.c
@@ -92,9 +92,11 @@
 main (gint argc, gchar *argv[])
 {
   GMainLoop *loop;
+  cmdline cmd;
+  cmd.argc = argc;
+  cmd.argv = argv;
 
   guint id;
-  //g_type_init ();
   loop = g_main_loop_new (NULL, FALSE);
 
   id = g_bus_own_name (G_BUS_TYPE_SESSION,
@@ -104,7 +106,7 @@
                        on_bus_acquired,
                        on_name_acquired,
                        on_name_lost,
-                       loop,
+                       &cmd,
                        NULL);
 
   g_main_loop_run (loop);