diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h
index 36060d33a..8de00ef6f 100644
--- a/src/blackmisc/containerbase.h
+++ b/src/blackmisc/containerbase.h
@@ -135,8 +135,7 @@ namespace BlackMisc
         virtual QString convertToQString(bool i18n = false) const override
         {
             QString str;
-            // qualifying stringify with this-> to workaround bug in GCC 4.7.2 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56402
-            std::for_each(derived().cbegin(), derived().cend(), [ & ](const T & value) { str += (str.isEmpty() ? "{" : ", ") + CContainerHelper::stringify(value, i18n); });
+            for (const auto &value : derived()) { str += (str.isEmpty() ? "{" : ", ") + CContainerHelper::stringify(value, i18n); }
             if (str.isEmpty()) { str = "{"; }
             return str += "}";
         }
diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp
index c54e8e0cf..7e0a0ce2f 100644
--- a/src/blackmisc/loghandler.cpp
+++ b/src/blackmisc/loghandler.cpp
@@ -80,7 +80,7 @@ namespace BlackMisc
 
     bool CLogHandler::isFallThroughEnabled(const QList<CLogCategoryHandler *> &handlers) const
     {
-        for (auto *handler : handlers)
+        for (const auto *handler : handlers)
         {
             if (handler->m_enableFallThrough != m_enableFallThrough)
             {
diff --git a/src/blackmisc/logmessage.h b/src/blackmisc/logmessage.h
index 9776c60c3..3ca2d4904 100644
--- a/src/blackmisc/logmessage.h
+++ b/src/blackmisc/logmessage.h
@@ -152,7 +152,7 @@ namespace BlackMisc
 
     private:
         QMessageLogger m_logger;
-        CStatusMessage::StatusSeverity m_severity { CStatusMessage::SeverityDebug };
+        CStatusMessage::StatusSeverity m_severity = CStatusMessage::SeverityDebug;
         QString m_category;
         QString m_message;
         QStringList m_args;
@@ -173,6 +173,6 @@ namespace BlackMisc
  * Convenience macro to construct a CLogMessage with the filename, line number, and function name,
  * for verbose debug messages.
  */
-#define BLACK_LOG (BlackMisc::CLogMessage{ __FILE__, __LINE__, Q_FUNC_INFO })
+#define BLACK_LOG (BlackMisc::CLogMessage { __FILE__, __LINE__, Q_FUNC_INFO })
 
 #endif
diff --git a/src/blackmisc/nwtextmessage.cpp b/src/blackmisc/nwtextmessage.cpp
index 13cd60529..b003a5870 100644
--- a/src/blackmisc/nwtextmessage.cpp
+++ b/src/blackmisc/nwtextmessage.cpp
@@ -111,7 +111,7 @@ namespace BlackMisc
         /*
          * Formatted string
          */
-        QString CTextMessage::asString(bool withSender, bool withRecipient, const QString separator) const
+        QString CTextMessage::asString(bool withSender, bool withRecipient, const QString &separator) const
         {
             QString s = this->receivedTime();
             if (withSender)
@@ -150,7 +150,7 @@ namespace BlackMisc
         /*
          * As status message
          */
-        CStatusMessage CTextMessage::asStatusMessage(bool withSender, bool withRecipient, const QString separator) const
+        CStatusMessage CTextMessage::asStatusMessage(bool withSender, bool withRecipient, const QString &separator) const
         {
             QString m = this->asString(withSender, withRecipient, separator);
             return { this->getMessageCategory(), CStatusMessage::SeverityInfo, m };
diff --git a/src/blackmisc/nwtextmessage.h b/src/blackmisc/nwtextmessage.h
index 907a4d0a7..395ac7bf1 100644
--- a/src/blackmisc/nwtextmessage.h
+++ b/src/blackmisc/nwtextmessage.h
@@ -132,7 +132,7 @@ namespace BlackMisc
              * \param separator         values separated by given value
              * \return
              */
-            QString asString(bool withSender, bool withRecipient, const QString separator = ", ") const;
+            QString asString(bool withSender, bool withRecipient, const QString &separator = ", ") const;
 
             /*!
              * Whole message as BlackMisc::CStatusMessage.
@@ -142,7 +142,7 @@ namespace BlackMisc
              * \param separator         values separated by given value
              * \return
              */
-            BlackMisc::CStatusMessage asStatusMessage(bool withSender, bool withRecipient, const QString separator = ", ") const;
+            BlackMisc::CStatusMessage asStatusMessage(bool withSender, bool withRecipient, const QString &separator = ", ") const;
 
             //! \brief Toggle sender receiver, can be used to ping my own message
             void toggleSenderRecipient();