diff --git a/src/epggrab/channel.c b/src/epggrab/channel.c
index 902dbed6..afff7205 100644
--- a/src/epggrab/channel.c
+++ b/src/epggrab/channel.c
@@ -233,6 +233,8 @@ void epggrab_channel_destroy
   while ((ecl = LIST_FIRST(&ec->channels)) != NULL)
     epggrab_channel_link_delete(ecl, delconf);
   RB_REMOVE(tree, ec, link);
+  free(ec->name);
+  free(ec->icon);
   free(ec->id);
   free(ec);
 }
diff --git a/src/epggrab/module.c b/src/epggrab/module.c
index ae48180a..dc16392c 100644
--- a/src/epggrab/module.c
+++ b/src/epggrab/module.c
@@ -200,9 +200,9 @@ static void _epggrab_module_channel_load
   htsmsg_t *a;
   htsmsg_field_t *f;
   channel_t *ch;
-
-  epggrab_channel_t *egc
-    = epggrab_channel_find(mod->channels, id, 1, &save, mod);
+  epggrab_channel_t *egc;
+  
+  egc  = epggrab_channel_find(mod->channels, id, 1, &save, mod);
 
   if ((str = htsmsg_get_str(m, "name")))
     egc->name = strdup(str);