diff --git a/src/e_mod_config.c b/src/e_mod_config.c
index 32ed794..96e22d2 100644
--- a/src/e_mod_config.c
+++ b/src/e_mod_config.c
@@ -21,7 +21,6 @@ _config_tclock_module(Config_Item *ci)
 {
    E_Config_Dialog *cfd = NULL;
    E_Config_Dialog_View *v = NULL;
-   E_Container *con = NULL;
    char buf[PATH_MAX];
 
    if (e_config_dialog_find("TClock", "_e_modules_tclock_config_dialog")) 
@@ -35,9 +34,9 @@ _config_tclock_module(Config_Item *ci)
 
    snprintf(buf, sizeof(buf), "%s/e-module-tclock.edj", 
             tclock_config->mod_dir);
-   con = e_container_current_get(e_manager_current_get());
-   cfd = e_config_dialog_new(con, D_("Tclock Settings"), "TClock", 
-                              "_e_modules_tclock_config_dialog", buf, 0, v, ci);
+   cfd = e_config_dialog_new(e_util_comp_current_get(), D_("Tclock Settings"),
+                              "TClock",  "_e_modules_tclock_config_dialog",
+                              buf, 0, v, ci);
    tclock_config->config_dialog = cfd;
 }
 
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index afad470..e8d58be 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -206,13 +206,13 @@ _tclock_cb_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
    if (!inst->ci->show_tip) return;
    if (inst->tip) return;
 
-   inst->tip = e_gadcon_popup_new(inst->gcc);
+   inst->tip = e_gadcon_popup_new(inst->gcc, EINA_FALSE);
 
    current_time = time(NULL);
    local_time = localtime(&current_time);
    memset(buf, 0, sizeof(buf));
    strftime(buf, 1024, inst->ci->tip_format, local_time);
-   inst->o_tip = e_widget_label_add(inst->tip->win->evas, buf);
+   inst->o_tip = e_widget_label_add(e_comp_get(inst->tip)->evas, buf);
 
    e_gadcon_popup_content_set(inst->tip, inst->o_tip);
    e_gadcon_popup_show(inst->tip);