diff --git a/src/border.c b/src/border.c
index 4d8855da1..281a17dd5 100644
--- a/src/border.c
+++ b/src/border.c
@@ -967,7 +967,7 @@ e_cb_border_mouse_down(E_Border *b, Ecore_Event *e)
    E_CFG_INT(cfg_focus_mode, "settings", "/focus/mode", 0);
    
    E_CONFIG_INT_GET(cfg_focus_mode, focus_mode);
-/*   ecore_pointer_grab(b->win.main, CurrentTime);*/
+   ecore_pointer_grab(b->win.main, CurrentTime);
    border_mouse_x = mouse_x;
    border_mouse_y = mouse_y;
    if (border_mouse_buttons) return;
@@ -998,7 +998,7 @@ e_cb_border_mouse_down(E_Border *b, Ecore_Event *e)
 		       printf("ungrab %s\n", b->client.title);
 		       ecore_button_ungrab(b->win.main, g->button, g->mods, g->any_mod);
 		       ecore_window_button_grab_auto_replay_set(b->win.main, 0);
-/*		       e_pointer_ungrab(((Ev_Mouse_Up *)(e->event))->time);*/
+		       ecore_pointer_ungrab(((Ecore_Event_Mouse_Up *)(e->event))->time);
 		       free(g);
 		       b->grabs = evas_list_remove(b->grabs, g);
 		       goto again;
diff --git a/src/desktops.c b/src/desktops.c
index b58de2041..7912fad0d 100644
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -183,7 +183,13 @@ e_desktops_init_file_display(E_Desktop *desk)
    /* fixme: later */
    /* uncomment this and comment out the next line for some tress testing */
    /* e_strdup(v->dir, "/dev"); */
-   e_strdup(v->dir, e_file_home());
+   /* e_strdup(v->dir, e_file_home()); */
+     {
+	char buf[PATH_MAX];
+	
+	sprintf(buf, "%s/desktop/default", e_config_user_dir());
+	e_strdup(v->dir, buf);
+     }
    
    /* FIXME: load bg here */
    {
diff --git a/src/icccm.c b/src/icccm.c
index 2160594b4..8da3a5d24 100644
--- a/src/icccm.c
+++ b/src/icccm.c
@@ -309,7 +309,11 @@ e_icccm_get_title(Window win, E_Border *b)
 
    if (b->client.title) 
      {
-	if ((title) && (!strcmp(title, b->client.title))) return;
+	if ((title) && (!strcmp(title, b->client.title))) 
+	  {
+	     FREE(title);
+	     return;
+	  }
 	b->changed = 1;
 	FREE(b->client.title);
      }
diff --git a/src/iconbar.c b/src/iconbar.c
index 178348cf3..94174aada 100644
--- a/src/iconbar.c
+++ b/src/iconbar.c
@@ -189,7 +189,7 @@ int
 e_iconbar_config(E_Iconbar *ib)
 {
   E_DB_File *db;
-  char buf[4096], *userdir;
+  char buf[PATH_MAX], *userdir;
   
   /*	userdir = e_config_user_dir(); */
   /*	sprintf(buf, "%sbehavior/iconbar.db", userdir); */
@@ -264,7 +264,7 @@ e_iconbar_config(E_Iconbar *ib)
 	
 	for ( i = 0; i < num; i++)
 	  {
-	    char *icon, *exec, buf[4096];
+	    char *icon, *exec, buf[PATH_MAX];
 	    
 	    sprintf(buf, "/ib/%i/icon", i);
 	    /* printf("reading #%i's icon...\n", i); */
@@ -294,7 +294,7 @@ e_iconbar_fix_icons(E_Iconbar *ib)
   Evas_List l;
   double cur, spacer;
   
-  spacer = 20.0;
+  spacer = 8.0;
   
   if (!ib->geom.horizontal)
     {