diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 777bcbb6fc6364fcfcc2c5b14aa0e5bb236e47ad..d9ed538cb0c0c1bb2822e88b70d1c09efc2f3538 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19728,13 +19728,13 @@ static void cleanup_stale_contexts(char *new, char *old)
 	char *oldcontext, *newcontext, *stalecontext, *stringp, newlist[AST_MAX_CONTEXT];
 
 	while ((oldcontext = strsep(&old, "&"))) {
-		stalecontext = '\0';
+		stalecontext = NULL;
 		ast_copy_string(newlist, new, sizeof(newlist));
 		stringp = newlist;
 		while ((newcontext = strsep(&stringp, "&"))) {
 			if (!strcmp(newcontext, oldcontext)) {
 				/* This is not the context you're looking for */
-				stalecontext = '\0';
+				stalecontext = NULL;
 				break;
 			} else if (strcmp(newcontext, oldcontext)) {
 				stalecontext = oldcontext;
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index aabac57a3a2f9f2e1518961f7ca79105884445da..3d56cc840d411d4fd474a334e25528d8d385d8e2 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2185,13 +2185,13 @@ static void cleanup_stale_contexts(char *new, char *old)
 	char *oldcontext, *newcontext, *stalecontext, *stringp, newlist[AST_MAX_CONTEXT];
 
 	while ((oldcontext = strsep(&old, "&"))) {
-		stalecontext = '\0';
+		stalecontext = NULL;
 		ast_copy_string(newlist, new, sizeof(newlist));
 		stringp = newlist;
 		while ((newcontext = strsep(&stringp, "&"))) {
 			if (strcmp(newcontext, oldcontext) == 0) {
 				/* This is not the context you're looking for */
-				stalecontext = '\0';
+				stalecontext = NULL;
 				break;
 			} else if (strcmp(newcontext, oldcontext)) {
 				stalecontext = oldcontext;
diff --git a/res/stasis_recording/stored.c b/res/stasis_recording/stored.c
index 6cc60fd28264c3fc388a4f3997e8e5092cc0aae0..59c07f8deaeada688fb1a66c8bbebe534bc0397d 100644
--- a/res/stasis_recording/stored.c
+++ b/res/stasis_recording/stored.c
@@ -470,7 +470,7 @@ int stasis_app_stored_recording_copy(struct stasis_app_stored_recording *src_rec
 	/* Drop the extension if specified, core will do this for us */
 	format = strrchr(dst_file, '.');
 	if (format) {
-		format = '\0';
+		*format = '\0';
 	}
 
 	/* See if any intermediary directories need to be made */