diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 249f932b0..b7fe923d7 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -105,7 +105,7 @@ e_drag_start(E_Zone *zone, const char *type, void *data,
 	ecore_evas_free(drag_ee);
      }
 
-   drag_ee = ecore_evas_software_x11_new(NULL, zone->container->manager->win,
+   drag_ee = ecore_evas_software_x11_new(NULL, zone->container->win,
 					 0, 0, 10, 10);
    ecore_evas_override_set(drag_ee, 1);
    ecore_evas_software_x11_direct_resize_set(drag_ee, 1);
diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c
index 7d9f6404f..9c7e4a229 100644
--- a/src/bin/e_moveresize.c
+++ b/src/bin/e_moveresize.c
@@ -16,7 +16,7 @@ void e_resize_begin(E_Zone *zone, int w, int h)
 	e_canvas_del(_ee);
 	ecore_evas_free(_ee);
      }
-   _ee = ecore_evas_software_x11_new(NULL, zone->container->manager->win,
+   _ee = ecore_evas_software_x11_new(NULL, zone->container->win,
 				     0, 0, 10, 10);
    ecore_evas_override_set(_ee, 1);
    ecore_evas_software_x11_direct_resize_set(_ee, 1);
@@ -83,7 +83,7 @@ void e_move_begin(E_Zone *zone, int x, int y)
 	e_canvas_del(_ee);
 	ecore_evas_free(_ee);
      }
-   _ee = ecore_evas_software_x11_new(NULL, zone->container->manager->win,
+   _ee = ecore_evas_software_x11_new(NULL, zone->container->win,
 					 0, 0, 10, 10);
    ecore_evas_override_set(_ee, 1);
    ecore_evas_software_x11_direct_resize_set(_ee, 1);
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 883bc37b4..9b96ca7ba 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -56,10 +56,10 @@ e_zone_new(E_Container *con, int num, int x, int y, int w, int h)
    zone->h = h;
    zone->num = num;
 
-   zone->flip.top = ecore_x_window_input_new(con->manager->win, 1, 0, w - 2, 1);
-   zone->flip.right = ecore_x_window_input_new(con->manager->win, w - 1, 1, 1, h - 2);
-   zone->flip.bottom = ecore_x_window_input_new(con->manager->win, 1, h - 1, w - 2, 1);
-   zone->flip.left = ecore_x_window_input_new(con->manager->win, 0, 1, 1, h - 2);
+   zone->flip.top = ecore_x_window_input_new(con->win, 1, 0, w - 2, 1);
+   zone->flip.right = ecore_x_window_input_new(con->win, w - 1, 1, 1, h - 2);
+   zone->flip.bottom = ecore_x_window_input_new(con->win, 1, h - 1, w - 2, 1);
+   zone->flip.left = ecore_x_window_input_new(con->win, 0, 1, 1, h - 2);
 
    zone->handlers = evas_list_append(zone->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_zone_cb_mouse_in, zone));
    zone->handlers = evas_list_append(zone->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_zone_cb_mouse_out, zone));
@@ -579,7 +579,7 @@ _e_zone_cb_timer(void *data)
 	      if (desk)
 		{
 		   e_desk_show(desk);
-		   ecore_x_pointer_warp(zone->container->manager->win, x, zone->h - 2);
+		   ecore_x_pointer_warp(zone->container->win, x, zone->h - 2);
 		   _e_zone_update_flip(zone);
 		}
 	   }
@@ -591,7 +591,7 @@ _e_zone_cb_timer(void *data)
 	      if (desk)
 		{
 		   e_desk_show(desk);
-		   ecore_x_pointer_warp(zone->container->manager->win, 2, y);
+		   ecore_x_pointer_warp(zone->container->win, 2, y);
 		   _e_zone_update_flip(zone);
 		}
 	   }
@@ -603,7 +603,7 @@ _e_zone_cb_timer(void *data)
 	      if (desk)
 		{
 		   e_desk_show(desk);
-		   ecore_x_pointer_warp(zone->container->manager->win, x, 2);
+		   ecore_x_pointer_warp(zone->container->win, x, 2);
 		   _e_zone_update_flip(zone);
 		}
 	   }
@@ -615,7 +615,7 @@ _e_zone_cb_timer(void *data)
 	      if (desk)
 		{
 		   e_desk_show(desk);
-		   ecore_x_pointer_warp(zone->container->manager->win, zone->w - 2, y);
+		   ecore_x_pointer_warp(zone->container->win, zone->w - 2, y);
 		   _e_zone_update_flip(zone);
 		}
 	   }