diff --git a/mbuni/mmlib/mms_mm7soap.c b/mbuni/mmlib/mms_mm7soap.c
index 1ebf594..6cb18e7 100644
--- a/mbuni/mmlib/mms_mm7soap.c
+++ b/mbuni/mmlib/mms_mm7soap.c
@@ -283,7 +283,9 @@ MSoapMsg_t *mm7_parse_soap(List *headers, Octstr *body)
 	       char *cid = (y && octstr_get_char(y, 0) == '<') ? octstr_get_cstr(y) + 1 : (y ? octstr_get_cstr(y) : "");
 	       int cid_len = (y && octstr_get_char(y, 0) == '<') ? octstr_len(y) - 2 : (y ? octstr_len(y) : 0);
 
-	       if (y && strncmp(loc, cid, cid_len) == 0)
+	       if (y && 
+		   (strncmp(loc, cid, cid_len) == 0 ||
+		    octstr_compare(y, cloc) == 0)) /* XXX seems wrong, but some MMC out there behave badly, so we support it */
 		    c = mime_entity_duplicate(x);
 	       
 	       if (y) 
diff --git a/mbuni/mmsbox/bearerbox.c b/mbuni/mmsbox/bearerbox.c
index 5a6c6a0..58082de 100644
--- a/mbuni/mmsbox/bearerbox.c
+++ b/mbuni/mmsbox/bearerbox.c
@@ -487,7 +487,7 @@ static void free_clientInfo(MmsHTTPClientInfo *h, int freeh)
 {
 
      debug("free info", 0,
-	   " entered free_clientinfo %d, ip=%d", freeh, (int)h->ip);
+	   " entered free_clientinfo %d, ip=%ld", freeh, (long)h->ip);
      
      if (h->ip) 
 	  octstr_destroy(h->ip);
diff --git a/mbuni/mmsc/mmsproxy.c b/mbuni/mmsc/mmsproxy.c
index dee16ed..ddbbf3f 100644
--- a/mbuni/mmsc/mmsproxy.c
+++ b/mbuni/mmsc/mmsproxy.c
@@ -1986,7 +1986,7 @@ static void free_clientInfo(MmsHTTPClientInfo *h, int freeh)
 {
 
      debug("free info", 0,
-	   " entered free_clientinfo %d, ip=%d", freeh, (int)h->ip);
+	   " entered free_clientinfo %d, ip=%ld", freeh, (long)h->ip);
 	  
      if (h->ip) 
 	  octstr_destroy(h->ip);