diff --git a/tagutils/tagutils.c b/tagutils/tagutils.c
index 821c59a..c3f1e0a 100644
--- a/tagutils/tagutils.c
+++ b/tagutils/tagutils.c
@@ -200,7 +200,7 @@ _make_composite_tags(struct song_metadata *psong)
 {
 	int len;
 
-	len = 0;
+	len = 1;
 
 	if(!psong->contributor[ROLE_ARTIST] &&
 	   (psong->contributor[ROLE_BAND] || psong->contributor[ROLE_CONDUCTOR]))
diff --git a/upnpreplyparse.c b/upnpreplyparse.c
index eef1c44..81d5a9f 100644
--- a/upnpreplyparse.c
+++ b/upnpreplyparse.c
@@ -30,7 +30,7 @@ NameValueParserGetData(void * d, const char * datas, int l)
     nv = malloc(sizeof(struct NameValue));
     if(l>511)
         l = 511;
-    strncpy(nv->name, data->curelt, 512);
+    strncpy(nv->name, data->curelt, 64);
     nv->name[63] = '\0';
     memcpy(nv->value, datas, l);
     nv->value[l] = '\0';