diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp
index be85af703..89508dcfe 100644
--- a/lib/base/streamlogger.cpp
+++ b/lib/base/streamlogger.cpp
@@ -89,6 +89,8 @@ void StreamLogger::ProcessLogEntry(ostream& stream, bool tty, const LogEntry& en
 			case LogCritical:
 				stream << "\x1b[1;31m"; // red
 				break;
+			default:
+				break;
 		}
 	}
 
diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index 646ae0ed8..b8f46c771 100644
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -31,8 +31,8 @@ bool I2_EXPORT TlsStream::m_SSLIndexInitialized = false;
  * @param sslContext The SSL context for the client.
  */
 TlsStream::TlsStream(const Stream::Ptr& innerStream, TlsRole role, shared_ptr<SSL_CTX> sslContext)
-	: m_InnerStream(innerStream), m_SSLContext(sslContext), m_Role(role),
-	  m_SendQueue(boost::make_shared<FIFO>()), m_RecvQueue(boost::make_shared<FIFO>())
+	: m_SSLContext(sslContext), m_SendQueue(boost::make_shared<FIFO>()), m_RecvQueue(boost::make_shared<FIFO>()),
+	  m_InnerStream(innerStream), m_Role(role)
 {
 	m_InnerStream->OnDataAvailable.connect(boost::bind(&TlsStream::DataAvailableHandler, this));
 	m_InnerStream->OnClosed.connect(boost::bind(&TlsStream::ClosedHandler, this));