diff --git a/main/channel.c b/main/channel.c
index 9104ef8ca1c5bc025e10d4d4873f691fc7e258d6..9239630fe76d59dc57e0dfa78b907d2f05c1212a 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -10344,7 +10344,7 @@ static void channel_set_intercept_mode(int in_intercept_mode)
 	int status;
 
 	status = ast_threadstorage_set_ptr(&in_intercept_routine,
-		in_intercept_mode ? (void *) 1 : (void *) 0);
+		in_intercept_mode ? &(int) { 1 } : NULL);
 	if (status) {
 		ast_log(LOG_ERROR, "Failed to set dialplan intercept mode\n");
 	}
diff --git a/main/logger.c b/main/logger.c
index 6b0e76f45f676c6fa716a0a185eb3a7f9baf5457..126a74d83dc6f85b04e50c4644aeae6851994949 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -2213,7 +2213,7 @@ void ast_log_safe(int level, const char *file, int line, const char *function, c
 		return;
 	}
 
-	if (ast_threadstorage_set_ptr(&in_safe_log, (void*)1)) {
+	if (ast_threadstorage_set_ptr(&in_safe_log, &(int) { 1 })) {
 		/* We've failed to set the flag that protects against
 		 * recursion, so bail. */
 		return;
diff --git a/utils/extconf.c b/utils/extconf.c
index afc893c48ff8c6e992e4721c0f3262eec5a070e4..2da33a82f0ae30246155883c160c80032306e670 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -2863,8 +2863,8 @@ static struct ast_config *ast_config_internal_load(const char *filename, struct
 
 static struct ast_config *ast_config_internal_load(const char *filename, struct ast_config *cfg, int withcomments, const char *suggested_incl_file)
 {
-	char db[256];
-	char table[256];
+	char db[256] = "";
+	char table[256] = "";
 	struct ast_config_engine *loader = &text_file_engine;
 	struct ast_config *result;