diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index b5d3ecb5d..03444c47e 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -1,5 +1,5 @@
 #include <e.h>
-#include <X11/extensions/shape.h>
+//#include <X11/extensions/shape.h>
 #include "config.h"
 #include "e_mod_main.h"
 #include "e_mod_gadman.h"
@@ -639,7 +639,7 @@ _get_bind_text(const char* action)
              strcat(b, l);
              free(l);
           }
-        return &b;
+        return strdup(b);
      }
    return "(You must define a binding)";
 }
diff --git a/src/modules/gadman/e_mod_gadman.h b/src/modules/gadman/e_mod_gadman.h
index 26568894e..6df6acf32 100644
--- a/src/modules/gadman/e_mod_gadman.h
+++ b/src/modules/gadman/e_mod_gadman.h
@@ -20,7 +20,7 @@ struct _Manager
    Evas_Object *mover;
    Evas_Object *mover_top;
    Evas_Object *full_bg;
-   char        *icon_name;
+   const char        *icon_name;
    
    int             visible;
    int             use_composite;
diff --git a/src/modules/gadman/e_mod_main.c b/src/modules/gadman/e_mod_main.c
index 50590b1ac..dca4662bc 100644
--- a/src/modules/gadman/e_mod_main.c
+++ b/src/modules/gadman/e_mod_main.c
@@ -41,8 +41,9 @@ e_modapi_init(E_Module *m)
    /* Menu augmentation */
    Man->icon_name = evas_stringshare_add(buf);
    Man->maug = NULL;
-   Man->maug = e_int_menus_menu_augmentation_add("config/1", _gadman_maug_add,
-                                                 Man->icon_name, NULL, NULL);
+   Man->maug = 
+     e_int_menus_menu_augmentation_add("config/1", _gadman_maug_add,
+                                       (void *)Man->icon_name, NULL, NULL);
    /* Create toggle action */
    Man->action = e_action_add("gadman_toggle");
    if (Man->action)