diff --git a/src/bin/channel.c b/src/bin/channel.c
index b2ce730..c3262af 100644
--- a/src/bin/channel.c
+++ b/src/bin/channel.c
@@ -330,8 +330,11 @@ _cb_tabregion_change(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void
    chl = data;
    evas_object_geometry_get(obj, NULL, NULL, &w, &h);
    evas_object_size_hint_min_set(chl->o_tabregion_base, w, h);
+   edje_object_part_swallow(chl->o_bg, "channel.tabregion", 
+                            chl->o_tabregion_bg);
    edje_object_part_swallow(chl->o_base, "channel.tabregion", 
                             chl->o_tabregion_base);
+
 }
 
 static void 
@@ -515,10 +518,15 @@ _channel_treeview_destroy(Channel *chl)
    edje_object_signal_emit(chl->o_base, "treeview,off", PACKAGE_NAME);
 
    if (chl->treeview.gitc) elm_genlist_item_class_free(chl->treeview.gitc);
+   chl->treeview.gitc = NULL;
    if (chl->treeview.itc) elm_genlist_item_class_free(chl->treeview.itc);
+   chl->treeview.itc = NULL;
    if (chl->treeview.o_list) evas_object_del(chl->treeview.o_list);
+   chl->treeview.o_list = NULL;
    if (chl->treeview.o_box) evas_object_del(chl->treeview.o_box);
+   chl->treeview.o_box = NULL;
    if (chl->treeview.o_frame) evas_object_del(chl->treeview.o_frame);
+   chl->treeview.o_frame = NULL;
 }
 
 static void 
diff --git a/src/bin/window.c b/src/bin/window.c
index af44903..f9c1441 100644
--- a/src/bin/window.c
+++ b/src/bin/window.c
@@ -1058,7 +1058,6 @@ _window_treeview_update(void)
    Eina_List *ll, *channels = NULL;
    Channel *chl;
    const char *name;
-   /* char *group; */
 
    channels = eina_list_clone(_win->channels);