diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h
index 9021aa551f..799a86332c 100644
--- a/include/asterisk/threadstorage.h
+++ b/include/asterisk/threadstorage.h
@@ -159,7 +159,7 @@ void *__ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size, co
 		if (!(buf = ast_calloc(1, init_size)))
 			return NULL;
 		pthread_setspecific(ts->key, buf);
-		__ast_threadstorage_object_add(buf, init_size, file, function, line);
+		__ast_threadstorage_object_add(ts->key, init_size, file, function, line);
 	}
 
 	return buf;
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 4b1a7f4173..4e4d9d5ee0 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -509,7 +509,7 @@ int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, c
 #define ast_realloc(a,b)	realloc(a,b)
 #define ast_strdup(a)		strdup(a)
 #define ast_strndup(a,b)	strndup(a,b)
-#define ast_asprintf(a,b,c)	asprintf(a,b,c)
+#define ast_asprintf(a,b,...)	asprintf(a,b,__VA_ARGS__)
 #define ast_vasprintf(a,b,c)	vasprintf(a,b,c)
 
 #endif /* AST_DEBUG_MALLOC */