diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 3cc770fca..bf466f883 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -1473,13 +1473,13 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
 		  broken_link = p[0];
 		  p += 1;
 		  
-		  path = p;
+		  path = (char *)p;
 		  p += strlen(path) + 1;
 
-		  lnk = p;
+		  lnk = (char *)p;
 		  p += strlen(lnk) + 1;
 		  
-		  rlnk = p;
+		  rlnk = (char *)p;
 		  p += strlen(rlnk) + 1;
 		  
 		  memcpy(&(finf.st), &st, sizeof(struct stat));
@@ -3804,8 +3804,6 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 	_e_fm2_icon_menu(ic, ic->sd->obj, ev->timestamp);
 	e_util_evas_fake_mouse_up_later(evas_object_evas_get(ic->sd->obj),
 					ev->button);
-//	evas_event_feed_mouse_up(evas_object_evas_get(ic->sd->obj), ev->button,
-//				 EVAS_BUTTON_NONE, ev->timestamp, NULL);
      }
 }
     
@@ -3949,9 +3947,6 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
 	     e_drag_start(d, ic->drag.x, ic->drag.y);
 	     e_util_evas_fake_mouse_up_later(evas_object_evas_get(ic->sd->obj),
 					     1);
-//	     evas_event_feed_mouse_up(evas_object_evas_get(ic->sd->obj),
-//				      1, EVAS_BUTTON_NONE,
-//				      ecore_x_current_time_get(), NULL);
 	  }
      }
 }
@@ -4175,7 +4170,7 @@ _e_fm2_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
    if (ev->button == 1)
      {
 	Evas_List *l;
-	int multi_sel = 0, range_sel = 0, seen = 0, sel_change = 0;
+	int multi_sel = 0, range_sel = 0, sel_change = 0;
 	
 	if (sd->config->selection.windows_modifiers)
 	  {
@@ -4218,8 +4213,6 @@ _e_fm2_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	_e_fm2_menu(sd->obj, ev->timestamp);
 	e_util_evas_fake_mouse_up_later(evas_object_evas_get(sd->obj),
 					ev->button);
-//	evas_event_feed_mouse_up(evas_object_evas_get(sd->obj), ev->button,
-//				 EVAS_BUTTON_NONE, ev->timestamp, NULL);
      }
 }
     
diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
index 191cdd012..8f7523603 100644
--- a/src/bin/e_fm_main.c
+++ b/src/bin/e_fm_main.c
@@ -329,7 +329,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
 	break;
       case 2: /* monitor dir end */
 	  {
-	     Evas_List *l, *ll;
+	     Evas_List *l;
 	     
 	     for (l = _e_dirs; l; l = l->next)
 	       {
@@ -684,13 +684,13 @@ _e_file_add_mod(int id, const char *path, int op, int listing)
    p[0] = broken_lnk;
    p += 1;
    
-   strcpy(p, path);
+   strcpy((char *)p, path);
    p += strlen(path) + 1;
    
-   strcpy(p, lnk);
+   strcpy((char *)p, lnk);
    p += strlen(lnk) + 1;
    
-   strcpy(p, rlnk);
+   strcpy((char *)p, rlnk);
    p += strlen(rlnk) + 1;
    
    bsz = p - buf;
@@ -891,13 +891,7 @@ static int
 _e_cb_fop_mv_idler(void *data)
 {
    E_Fop *fop;
-   struct Fop_Data {
-      DIR *dir;
-      const char *path, *path2;
-   } *fd, *fd2;
-   struct dirent *dp = NULL;
-   char buf[PATH_MAX], buf2[PATH_MAX], *lnk;
-   
+
    fop = (E_Fop *)data;
    if (!fop->data)
      {
@@ -1203,7 +1197,7 @@ _e_path_fix_order(const char *path, const char *rel, int rel_to, int x, int y)
 	  {
 	     if (!strcmp(l->data, rel))
 	       {
-		  printf("INSERT %s\n", l->data);
+		  printf("INSERT %s\n", (char *)l->data);
 		  if (rel_to == 2) /* replace */
 		    {
 		       free(l->data);
@@ -1226,8 +1220,8 @@ _e_path_fix_order(const char *path, const char *rel, int rel_to, int x, int y)
 	  {
 	     while (files)
 	       {
-		  printf("W %s\n", files->data);
-		  fprintf(fh, "%s\n", files->data);
+		  printf("W %s\n", (char *)files->data);
+		  fprintf(fh, "%s\n", (char *)files->data);
 		  free(files->data);
 		  files = evas_list_remove_list(files, files);
 	       }
diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c
index f76ed5dc4..d6d9a7f79 100644
--- a/src/bin/e_fm_prop.c
+++ b/src/bin/e_fm_prop.c
@@ -51,7 +51,6 @@ static void _cb_preview_update(void *data, Evas_Object *obj, void *event_info);
 static void _cb_fsel_sel(void *data, Evas_Object *obj);
 static void _cb_fsel_ok(void *data, E_Dialog *dia);
 static void _cb_fsel_cancel(void *data, E_Dialog *dia);
-static void _cb_file_change(void *data);
 
 /* Actual config data we will be playing with whil the dialog is active */
 struct _E_Config_Dialog_Data