diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index e242649a9..3603af0e8 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -346,10 +346,15 @@ e_app_files_prepend_relative(Evas_List *files, E_App *before)
    for (l = files; l; l = l->next)
      {
 	char *file;
+	char buf[PATH_MAX];
 
 	file = l->data;
 	if (!_e_app_is_eapp(file)) continue;
-	if (!ecore_file_download(file, _e_apps_path_all)) continue;
+	/* FIXME: If we are downloading something from net, we must
+	 * attach a callback and wait for the download to finish */
+	snprintf(buf, sizeof(buf), "%s/%s", _e_apps_path_all,
+				   ecore_file_get_file(file));
+	if (!ecore_file_download(file, _e_apps_path_all, NULL, NULL)) continue;
      }
    /* Force rescan of all subdir */
    _e_app_subdir_rescan(_e_apps_all);
@@ -389,18 +394,22 @@ e_app_files_prepend_relative(Evas_List *files, E_App *before)
 void
 e_app_files_append(Evas_List *files, E_App *parent)
 {
-   Evas_List *l, *subapps, *changes = NULL;
-   E_App_Change_Info *ch;
+   Evas_List *l, *subapps;
 
    subapps = parent->subapps;
 
    for (l = files; l; l = l->next)
      {
 	char *file;
+	char buf[PATH_MAX];
 
 	file = l->data;
 	if (!_e_app_is_eapp(file)) continue;
-	if (!ecore_file_download(file, _e_apps_path_all)) continue;
+	/* FIXME: If we are downloading something from net, we must
+	 * attach a callback and wait for the download to finish */
+	snprintf(buf, sizeof(buf), "%s/%s", _e_apps_path_all,
+				   ecore_file_get_file(file));
+	if (!ecore_file_download(file, buf, NULL, NULL)) continue;
      }
    /* Force rescan of all subdir */
    _e_app_subdir_rescan(_e_apps_all);
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 95aae64ba..70d2c2503 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -611,6 +611,7 @@ _e_dnd_cb_event_dnd_enter(void *data, int type, void *event)
 	       }
 	     break;
 	  }
+#if 0
 	else if (!strcmp("text/x-moz-url", ev->types[i]))
 	  {
 	     _xdnd = E_NEW(XDnd, 1);
@@ -626,6 +627,7 @@ _e_dnd_cb_event_dnd_enter(void *data, int type, void *event)
 	       }
 	     break;
 	  }
+#endif
      }
    return 1;
 }
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 0ad5aa5b5..f878ef91c 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -8,7 +8,6 @@
  */
 
 static void _e_zone_free(E_Zone *zone);
-static void _e_zone_cb_menu_end(void *data, E_Menu *m);
 static void _e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _e_zone_cb_bg_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info);
@@ -573,12 +572,6 @@ _e_zone_free(E_Zone *zone)
    free(zone);
 }
 
-static void
-_e_zone_cb_menu_end(void *data, E_Menu *m)
-{
-   e_object_del(E_OBJECT(m));
-}
-
 static void
 _e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
 {