diff --git a/debian/tvheadend.tvheadend.init b/debian/tvheadend.init
similarity index 100%
rename from debian/tvheadend.tvheadend.init
rename to debian/tvheadend.init
diff --git a/src/dvb/dvb_support.c b/src/dvb/dvb_support.c
index 9830c2b9..9e8b71e7 100644
--- a/src/dvb/dvb_support.c
+++ b/src/dvb/dvb_support.c
@@ -41,7 +41,7 @@ static int convert_iso_8859[16] = {
 #define convert_utf8   14
 #define convert_iso6937 15
 
-static inline int encode_utf8(uint16_t c, char *outb, int outleft)
+static inline int encode_utf8(unsigned int c, char *outb, int outleft)
 {
   if (c <= 0x7F && outleft >= 1) {
     *outb = c;
diff --git a/src/htsmsg.c b/src/htsmsg.c
index c86b97cf..dab63ee0 100644
--- a/src/htsmsg.c
+++ b/src/htsmsg.c
@@ -268,6 +268,7 @@ htsmsg_add_msg(htsmsg_t *msg, const char *name, htsmsg_t *sub)
 
   assert(sub->hm_data == NULL);
   TAILQ_MOVE(&f->hmf_msg.hm_fields, &sub->hm_fields, hmf_link);
+  f->hmf_msg.hm_islist = sub->hm_islist;
   free(sub);
 }
 
@@ -285,6 +286,7 @@ htsmsg_add_msg_extname(htsmsg_t *msg, const char *name, htsmsg_t *sub)
 
   assert(sub->hm_data == NULL);
   TAILQ_MOVE(&f->hmf_msg.hm_fields, &sub->hm_fields, hmf_link);
+  f->hmf_msg.hm_islist = sub->hm_islist;
   free(sub);
 }
 
diff --git a/src/htsmsg_json.c b/src/htsmsg_json.c
index 88cd0e31..a302247d 100644
--- a/src/htsmsg_json.c
+++ b/src/htsmsg_json.c
@@ -233,7 +233,10 @@ htsmsg_json_parse_object(const char *s, const char **endp)
 
   r = htsmsg_create_map();
   
-  while(1) {
+  while(*s > 0 && *s < 33)
+    s++;
+
+  if(*s != '}') while(1) {
 
     if((name = htsmsg_json_parse_string(s, &s2)) == NULL) {
       htsmsg_destroy(r);