diff --git a/src/muxes.h b/src/muxes.h
index 43511a83..eda77e08 100644
--- a/src/muxes.h
+++ b/src/muxes.h
@@ -23,14 +23,14 @@ typedef struct mux {
   LIST_ENTRY(mux) link;
  unsigned int freq;
  unsigned int symrate;
- char fec;
- char constellation;
- char bw;
- char fechp;
- char feclp;
- char tmode;
- char guard;
- char hierarchy;
+ short fec;
+ short constellation;
+ short bw;
+ short fechp;
+ short feclp;
+ short tmode;
+ short guard;
+ short hierarchy;
  char polarisation;
 } mux_t;
 
diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 3c5426c7..c4e3df51 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -343,8 +343,9 @@ extjs_channels_update(htsmsg_t *in)
       channel_set_number(ch, atoi(s));
 
     if((s = htsmsg_get_str(c, "epggrabsrc")) != NULL) {
-      char *sptr;
-      char *modecid  = strtok_r((char*)s, ",", &sptr);
+      char *tmp = strdup(s);
+      char *sptr = NULL;
+      char *modecid  = strtok_r(tmp, ",", &sptr);
       char *modid, *ecid;
       epggrab_module_t *mod;
       epggrab_channel_t *ec;
@@ -376,6 +377,9 @@ extjs_channels_update(htsmsg_t *in)
 
         epggrab_channel_link(ec, ch);
       }
+
+      /* Cleanup */
+      free(tmp);
     }
   }
 }