diff --git a/lib/mu-msg-json.c b/lib/mu-msg-json.c
index dceb6a4a..944fb068 100644
--- a/lib/mu-msg-json.c
+++ b/lib/mu-msg-json.c
@@ -251,8 +251,6 @@ errexit:
 static gchar*
 get_temp_file_maybe (MuMsg *msg, MuMsgPart *part, MuMsgOptions opts)
 {
-	char *tmp, *tmpfile;
-
 	opts |= MU_MSG_OPTION_USE_EXISTING;
 
 	if  (!(opts & MU_MSG_OPTION_EXTRACT_IMAGES) ||
@@ -273,7 +271,6 @@ typedef struct _PartInfo	 PartInfo;
 static void
 add_part_crypto (JsonBuilder *bob, MuMsgPart *mpart, PartInfo *pinfo)
 {
-	char				*signers, *s;
 	const char			*verdict;
 	MuMsgPartSigStatusReport	*report;
 
@@ -329,13 +326,11 @@ static void
 each_part (MuMsg *msg, MuMsgPart *part, PartInfo *pinfo)
 {
 	char		*name, *tmpfile;
-	const char	*cid;
 
 	pinfo->bob = json_builder_begin_object(pinfo->bob);
 
 	name	 = mu_msg_part_get_filename (part, TRUE);
 	tmpfile  = get_temp_file_maybe (msg, part, pinfo->opts);
-	cid	 = mu_msg_part_get_content_id(part);
 
 	add_int_member    (pinfo->bob, "index", part->index);
 	add_string_member (pinfo->bob, "name", name);
diff --git a/lib/tests/test-mu-str.c b/lib/tests/test-mu-str.c
index bbdb2483..cf3906c4 100644
--- a/lib/tests/test-mu-str.c
+++ b/lib/tests/test-mu-str.c
@@ -277,7 +277,7 @@ test_mu_str_subject_normalize (void)
 	int i;
 
 	struct {
-		char *src, *exp;
+		const char *src, *exp;
 	} tests[] = {
 		{ "test123", "test123" },
 		{ "Re:test123", "test123" },