diff --git a/unsorted/ecore/ecore_audio_custom.c b/unsorted/ecore/ecore_audio_custom.c
index 2b6d1335..8234b1e1 100644
--- a/unsorted/ecore/ecore_audio_custom.c
+++ b/unsorted/ecore/ecore_audio_custom.c
@@ -52,6 +52,8 @@ main(int argc, const char *argv[])
    ecore_init();
    ecore_audio_init();
 
+   ecore_app_args_set(argc, argv);
+
    out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
 
    in = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL);
diff --git a/unsorted/ecore/ecore_audio_playback.c b/unsorted/ecore/ecore_audio_playback.c
index c3314eeb..788326b2 100644
--- a/unsorted/ecore/ecore_audio_playback.c
+++ b/unsorted/ecore/ecore_audio_playback.c
@@ -159,7 +159,7 @@ handle_cmd(char *cmd, size_t bread)
 }
 
 Eina_Bool
-handle_input(void *data, Ecore_Fd_Handler *handler)
+handle_input(void *data EINA_UNUSED, Ecore_Fd_Handler *handler)
 {
    size_t bread;
    char buf[20];
@@ -184,17 +184,6 @@ handle_input(void *data, Ecore_Fd_Handler *handler)
    return EINA_TRUE;
 }
 
-static Eina_Bool _play_started(void *data, int type, void *event)
-{
-  const char *name;
-  Eo *in = event;
-
-  eo_do(in, ecore_audio_obj_name_get(&name));
-  printf("Start: %s\n", name);
-
-  return EINA_TRUE;
-}
-
 static Eina_Bool _play_finished(void *data EINA_UNUSED, Eo *in, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
 {
   const char *name;
@@ -279,7 +268,9 @@ main(int argc, const char *argv[])
                  printf("error when creating ecore audio source.\n");
                  goto end;
               }
-            eo_do(in, ecore_audio_obj_name_set(basename(argv[i])));
+            tmp = strdup(argv[i]);
+            eo_do(in, ecore_audio_obj_name_set(basename(tmp)));
+            free(tmp);
             eo_do(in, ecore_audio_obj_source_set(argv[i]));
          }
        eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL));
diff --git a/unsorted/ecore/ecore_audio_to_ogg.c b/unsorted/ecore/ecore_audio_to_ogg.c
index e5d05ce2..973941d4 100644
--- a/unsorted/ecore/ecore_audio_to_ogg.c
+++ b/unsorted/ecore/ecore_audio_to_ogg.c
@@ -15,7 +15,7 @@
 double volume = 1;
 Eina_List *inputs = NULL;
 
-static Eina_Bool _play_finished(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info)
+static Eina_Bool _play_finished(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
 {
   const char *name;
   Eo *out;
@@ -33,9 +33,8 @@ static Eina_Bool _play_finished(void *data, Eo *obj, const Eo_Event_Description
 }
 
 int
-main(int argc, const char *argv[])
+main(int argc, char *argv[])
 {
-   int ret;
    Eo *out;
    Eo *in;
 
@@ -62,7 +61,6 @@ main(int argc, const char *argv[])
 
    ecore_main_loop_begin();
 
-end:
    ecore_audio_shutdown();
    ecore_shutdown();