diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 2066fea..79522f0 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -127,7 +127,7 @@ ds_fade_setup(Evas_Object_Event_Cb click_cb)
    if (click_cb)
      evas_object_event_callback_add(fade_obj, EVAS_CALLBACK_MOUSE_DOWN, click_cb, NULL);
    evas_object_name_set(fade_obj, "fade_obj");
-   evas_object_geometry_set(fade_obj, 0, 0, e_comp->man->w, e_comp->man->h);
+   evas_object_geometry_set(fade_obj, 0, 0, e_comp->w, e_comp->h);
    evas_object_layer_set(fade_obj, E_LAYER_MENU + 1);
    evas_object_show(fade_obj);
    efx_fade(fade_obj, EFX_EFFECT_SPEED_LINEAR, EFX_COLOR(0, 0, 0), 0, 0.0, NULL, NULL);
diff --git a/src/pip.c b/src/pip.c
index 632e59b..4c516c8 100644
--- a/src/pip.c
+++ b/src/pip.c
@@ -131,8 +131,8 @@ _pip_mouse_move(Pip *pip, int t EINA_UNUSED, Ecore_Event_Mouse_Move *ev)
    else if (pip->move)
      {
         evas_object_move(pip->pip,
-          E_CLAMP(e_comp_canvas_x_root_adjust(ev->root.x) - pip->down.x, 0, e_comp->man->w - (w / 2)),
-          E_CLAMP(e_comp_canvas_y_root_adjust(ev->root.y) - pip->down.y, 0, e_comp->man->h - (h / 2)));
+          E_CLAMP(e_comp_canvas_x_root_adjust(ev->root.x) - pip->down.x, 0, e_comp->w - (w / 2)),
+          E_CLAMP(e_comp_canvas_y_root_adjust(ev->root.y) - pip->down.y, 0, e_comp->h - (h / 2)));
      }
    else if (pip->crop)
      {
diff --git a/src/zoom.c b/src/zoom.c
index addb968..7dab6be 100644
--- a/src/zoom.c
+++ b/src/zoom.c
@@ -487,7 +487,7 @@ zoom(Eina_List *clients, E_Zone *zone)
    e_theme_edje_object_set(zoom_obj, NULL, "e/modules/desksanity/zoom/base");
 
    bg_obj = e_icon_add(e_comp->evas);
-   bgf = e_bg_file_get(e_comp->man->num, zone->num, zone->desk_x_current, zone->desk_y_current);
+   bgf = e_bg_file_get(zone->num, zone->desk_x_current, zone->desk_y_current);
    if (eina_str_has_extension(bgf, ".edj"))
      e_icon_file_edje_set(bg_obj, bgf, "e/desktop/background");
    else