diff --git a/src/NetworkConnection.cpp b/src/NetworkConnection.cpp
index ace41ec69f..8d6d7468d3 100644
--- a/src/NetworkConnection.cpp
+++ b/src/NetworkConnection.cpp
@@ -17,9 +17,10 @@ using namespace nt;
 NetworkConnection::NetworkConnection(std::unique_ptr<TCPStream> stream,
                                      Message::GetEntryTypeFunc get_entry_type)
     : m_stream(std::move(stream)),
-      m_get_entry_type(get_entry_type),
-      m_active(false),
-      m_proto_rev(0x0300) {}
+      m_get_entry_type(get_entry_type) {
+  m_active = false;
+  m_proto_rev = 0x0300;
+}
 
 NetworkConnection::~NetworkConnection() { Stop(); }
 
diff --git a/src/Storage.h b/src/Storage.h
index 6f913a55b1..6447e4af2b 100644
--- a/src/Storage.h
+++ b/src/Storage.h
@@ -26,7 +26,7 @@ class StorageTest;
 
 class StorageEntry {
  public:
-  StorageEntry() : m_flags(0), m_id(0xffff) {}
+  StorageEntry() : m_id(0xffff) { m_flags = 0; }
 
   bool IsPersistent() const { return (m_flags & NT_PERSISTENT) != 0; }