diff --git a/src/framework/core/logger.cpp b/src/framework/core/logger.cpp
index c4bcbc9a..41aabbfd 100644
--- a/src/framework/core/logger.cpp
+++ b/src/framework/core/logger.cpp
@@ -34,6 +34,12 @@
 
 Logger g_logger;
 
+namespace
+{
+    const std::string s_logPrefixes[] = { "", "", "WARNING: ", "ERROR: ", "FATAL ERROR: " };
+    bool s_ignoreLogs = false;
+}
+
 void Logger::log(Fw::LogLevel level, const std::string& message)
 {
     std::lock_guard<std::recursive_mutex> lock(m_mutex);
@@ -43,13 +49,10 @@ void Logger::log(Fw::LogLevel level, const std::string& message)
         return;
 #endif
 
-    static bool ignoreLogs = false;
-    if(ignoreLogs)
+    if(s_ignoreLogs)
         return;
 
-    const static std::string logPrefixes[] = { "", "", "WARNING: ", "ERROR: ", "FATAL ERROR: " };
-
-    std::string outmsg = logPrefixes[level] + message;
+    std::string outmsg = s_logPrefixes[level] + message;
 
     /*
 #if !defined(NDEBUG) && !defined(WIN32)
@@ -91,7 +94,7 @@ void Logger::log(Fw::LogLevel level, const std::string& message)
 #ifdef FW_GRAPHICS
         g_window.displayFatalError(message);
 #endif
-        ignoreLogs = true;
+        s_ignoreLogs = true;
         exit(-1);
     }
 }
@@ -122,8 +125,7 @@ void Logger::fireOldMessages()
     std::lock_guard<std::recursive_mutex> lock(m_mutex);
 
     if(m_onLog) {
-        auto backup = m_logMessages;
-        for(const LogMessage& logMessage : backup) {
+        for(const LogMessage& logMessage : m_logMessages) {
             m_onLog(logMessage.level, logMessage.message, logMessage.when);
         }
     }
diff --git a/src/framework/core/logger.h b/src/framework/core/logger.h
index bebd5e24..c1226947 100644
--- a/src/framework/core/logger.h
+++ b/src/framework/core/logger.h
@@ -59,7 +59,7 @@ public:
     void setOnLog(const OnLogCallback& onLog) { m_onLog = onLog; }
 
 private:
-    std::list<LogMessage> m_logMessages;
+    std::deque<LogMessage> m_logMessages;
     OnLogCallback m_onLog;
     std::ofstream m_outFile;
     std::recursive_mutex m_mutex;