diff --git a/src/e_mod_config.c b/src/e_mod_config.c
index f3d2865..fc954c3 100644
--- a/src/e_mod_config.c
+++ b/src/e_mod_config.c
@@ -24,7 +24,7 @@ _config_forecasts_module(Config_Item *ci)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   E_Container *con;
+   E_Comp *comp;
    char buf[4096];
 
    v = E_NEW(E_Config_Dialog_View, 1);
@@ -37,9 +37,9 @@ _config_forecasts_module(Config_Item *ci)
 
    snprintf(buf, sizeof(buf), "%s/module.edj",
             e_module_dir_get(forecasts_config->module));
-   con = e_container_current_get(e_manager_current_get());
+   comp = e_util_comp_current_get();
    cfd =
-     e_config_dialog_new(con, D_("Forecasts Settings"), "Forecasts", "_e_modules_forecasts_config_dialog", buf, 0, v, ci);
+     e_config_dialog_new(comp, D_("Forecasts Settings"), "Forecasts", "_e_modules_forecasts_config_dialog", buf, 0, v, ci);
    forecasts_config->config_dialog = cfd;
 }
 
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index dd27405..0e7fcd9 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -1003,9 +1003,9 @@ _forecasts_popup_content_create(Instance *inst)
 
    if (!inst->location) return;
 
-   inst->popup = e_gadcon_popup_new(inst->gcc);
+   inst->popup = e_gadcon_popup_new(inst->gcc, E_COMP_OBJECT_TYPE_POPUP);
 
-   evas = inst->popup->win->evas;
+   evas = e_comp_get(inst->gcc)->evas;
    o = e_widget_list_add(evas, 0, 0);
    snprintf(buf, sizeof(buf), D_("%s: Current Conditions"), inst->location);
    of = e_widget_frametable_add(evas, buf, 0);
@@ -1014,7 +1014,7 @@ _forecasts_popup_content_create(Instance *inst)
    ob = e_widget_label_add(evas, buf);
    e_widget_frametable_object_append(of, ob, 0, row, 2, 1, 0, 0, 1, 0);
 
-   oi = _forecasts_popup_icon_create(inst->popup->win->evas,
+   oi = _forecasts_popup_icon_create(e_comp_get(inst->gcc)->evas,
                                      inst->condition.code);
    edje_object_size_max_get(oi, &w, &h);
    DEBUG("Icon size %dx%d", w, h);
@@ -1097,7 +1097,7 @@ _forecasts_popup_content_create(Instance *inst)
         e_widget_frametable_object_append(of, ob, 1, row, 1, 1, 1, 0, 1, 0);
 
         ob = e_widget_image_add_from_object(evas,
-                                            _forecasts_popup_icon_create(inst->popup->win->evas,
+                                            _forecasts_popup_icon_create(e_comp_get(inst->gcc)->evas,
                                                                          inst->forecast[i].code), 0, 0);
         e_widget_frametable_object_append(of, ob, 2, row, 1, 2, 1, 1, 0, 0);