diff --git a/src/RedirectablePrint.cpp b/src/RedirectablePrint.cpp
index 943d3898..04dbcdd4 100644
--- a/src/RedirectablePrint.cpp
+++ b/src/RedirectablePrint.cpp
@@ -5,6 +5,7 @@
 #include "configuration.h"
 #include <assert.h>
 #include <cstring>
+#include <memory>
 #include <stdexcept>
 #include <sys/time.h>
 #include <time.h>
@@ -177,14 +178,14 @@ void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16
 
 std::string RedirectablePrint::mt_sprintf(const std::string fmt_str, ...)
 {
-    int final_n, n = ((int)fmt_str.size()) * 2; /* Reserve two times as much as the length of the fmt_str */
+    int n = ((int)fmt_str.size()) * 2; /* Reserve two times as much as the length of the fmt_str */
     std::unique_ptr<char[]> formatted;
     va_list ap;
     while (1) {
         formatted.reset(new char[n]); /* Wrap the plain char array into the unique_ptr */
         strcpy(&formatted[0], fmt_str.c_str());
         va_start(ap, fmt_str);
-        final_n = vsnprintf(&formatted[0], n, fmt_str.c_str(), ap);
+        int final_n = vsnprintf(&formatted[0], n, fmt_str.c_str(), ap);
         va_end(ap);
         if (final_n < 0 || final_n >= n)
             n += abs(final_n - n + 1);
diff --git a/suppressions.txt b/suppressions.txt
index 3db2d5b7..0dd5198e 100644
--- a/suppressions.txt
+++ b/suppressions.txt
@@ -43,3 +43,4 @@ postfixOperator:*/mqtt/*
 missingOverride
 virtualCallInConstructor
 
+passedByValue:*/RedirectablePrint.h