diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index c42912122..1ca1a57fd 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -919,7 +919,6 @@ _e_comp_act_opacity_obj_finder(E_Object *obj)
      {
       case E_CLIENT_TYPE:
         return ((E_Client*)obj)->frame;
-      default:
       case E_ZONE_TYPE:
       case E_MANAGER_TYPE:
       case E_MENU_TYPE:
@@ -928,7 +927,8 @@ _e_comp_act_opacity_obj_finder(E_Object *obj)
      }
    if (e_obj_is_win(obj))
      return e_win_client_get((void*)obj)->frame;
-   return NULL;
+   ec = e_client_focused_get();
+   return ec ? ec->frame : NULL;
 }
 
 static void
diff --git a/src/bin/e_obj_dialog.c b/src/bin/e_obj_dialog.c
index 1482b1201..526062ff9 100644
--- a/src/bin/e_obj_dialog.c
+++ b/src/bin/e_obj_dialog.c
@@ -19,14 +19,13 @@ _key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
 }
 
 EAPI E_Obj_Dialog *
-e_obj_dialog_new(E_Comp *c, char *title, char *class_name, char *class_class)
+e_obj_dialog_new(E_Comp *c EINA_UNUSED, char *title, char *class_name, char *class_class)
 {
    E_Obj_Dialog *od;
    Evas_Object *o;
    Eina_Bool kg;
    Evas_Modifier_Mask mask;
 
-   if (!c) c = e_util_comp_current_get();
    od = E_OBJECT_ALLOC(E_Obj_Dialog, E_OBJ_DIALOG_TYPE, _e_obj_dialog_free);
    if (!od) return NULL;
    od->win = elm_win_add(NULL, NULL, ELM_WIN_DIALOG_BASIC);
diff --git a/src/bin/e_win.c b/src/bin/e_win.c
index a4ed5a7f1..20b6989c5 100644
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@@ -197,7 +197,7 @@ static Eina_Bool
 _e_elm_win_trap_size_min_set(void *data, Evas_Object *o __UNUSED__, int w, int h)
 {
    Elm_Win_Trap_Ctx *ctx = data;
-   int mw, mh;
+   int mw = 0, mh = 0;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE);
    if (!ctx->client) return EINA_TRUE;
@@ -216,7 +216,7 @@ static Eina_Bool
 _e_elm_win_trap_size_max_set(void *data, Evas_Object *o __UNUSED__, int w, int h)
 {
    Elm_Win_Trap_Ctx *ctx = data;
-   int mw, mh;
+   int mw = 0, mh = 0;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE);
    if (!ctx->client) return EINA_TRUE;
@@ -235,7 +235,7 @@ static Eina_Bool
 _e_elm_win_trap_size_base_set(void *data, Evas_Object *o __UNUSED__, int w, int h)
 {
    Elm_Win_Trap_Ctx *ctx = data;
-   int mw, mh;
+   int mw = 0, mh = 0;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_TRUE);
    if (!ctx->client) return EINA_TRUE;