diff --git a/fairmq/shmem/Message.h b/fairmq/shmem/Message.h
index 50b119fb..9c75b249 100644
--- a/fairmq/shmem/Message.h
+++ b/fairmq/shmem/Message.h
@@ -77,7 +77,12 @@ class Message final : public fair::mq::Message
         fManager.IncrementMsgCounter();
     }
 
-    Message(Manager& manager, UnmanagedRegionPtr& region, void* data, const size_t size, void* hint = 0, fair::mq::TransportFactory* factory = nullptr)
+    Message(Manager& manager,
+            UnmanagedRegionPtr& region,
+            void* data,
+            const size_t size,
+            void* hint = nullptr,
+            fair::mq::TransportFactory* factory = nullptr)
         : fair::mq::Message(factory)
         , fManager(manager)
         , fLocalPtr(static_cast<char*>(data))
diff --git a/fairmq/shmem/TransportFactory.h b/fairmq/shmem/TransportFactory.h
index c8720e84..60850245 100644
--- a/fairmq/shmem/TransportFactory.h
+++ b/fairmq/shmem/TransportFactory.h
@@ -118,7 +118,10 @@ class TransportFactory final : public fair::mq::TransportFactory
         return std::make_unique<Message>(*fManager, data, size, ffn, hint, this);
     }
 
-    MessagePtr CreateMessage(UnmanagedRegionPtr& region, void* data, size_t size, void* hint = 0) override
+    MessagePtr CreateMessage(UnmanagedRegionPtr& region,
+                             void* data,
+                             size_t size,
+                             void* hint = nullptr) override
     {
         return std::make_unique<Message>(*fManager, region, data, size, hint, this);
     }
diff --git a/fairmq/shmem/UnmanagedRegion.h b/fairmq/shmem/UnmanagedRegion.h
index fb4da9a4..b3ba2229 100644
--- a/fairmq/shmem/UnmanagedRegion.h
+++ b/fairmq/shmem/UnmanagedRegion.h
@@ -102,7 +102,7 @@ struct UnmanagedRegion
             }
             fFileMapping = file_mapping(fName.c_str(), read_write);
             LOG(debug) << "UnmanagedRegion(): initialized file: " << fName;
-            fRegion = mapped_region(fFileMapping, read_write, 0, size, 0, cfg.creationFlags);
+            fRegion = mapped_region(fFileMapping, read_write, 0, size, nullptr, cfg.creationFlags);
         } else {
             try {
                 // if opening fails, create
@@ -126,7 +126,7 @@ struct UnmanagedRegion
             }
 
             try {
-                fRegion = mapped_region(fShmemObject, read_write, 0, 0, 0, cfg.creationFlags);
+                fRegion = mapped_region(fShmemObject, read_write, 0, 0, nullptr, cfg.creationFlags);
                 if (size != 0 && size != fRegion.get_size()) {
                     LOG(error) << "Created/opened region size (" << fRegion.get_size() << ") does not match configured size (" << size << ")";
                     throw TransportError(tools::ToString("Created/opened region size (", fRegion.get_size(), ") does not match configured size (", size, ")"));
diff --git a/fairmq/zeromq/Message.h b/fairmq/zeromq/Message.h
index a00bfb0c..5698a107 100644
--- a/fairmq/zeromq/Message.h
+++ b/fairmq/zeromq/Message.h
@@ -107,7 +107,11 @@ class Message final : public fair::mq::Message
         }
     }
 
-    Message(UnmanagedRegionPtr& region, void* data, const size_t size, void* hint = 0, fair::mq::TransportFactory* factory = nullptr)
+    Message(UnmanagedRegionPtr& region,
+            void* data,
+            const size_t size,
+            void* hint = nullptr,
+            fair::mq::TransportFactory* factory = nullptr)
         : fair::mq::Message(factory)
         , fMsg(std::make_unique<zmq_msg_t>())
     {
diff --git a/fairmq/zeromq/TransportFactory.h b/fairmq/zeromq/TransportFactory.h
index f94db48b..3ecee9f3 100644
--- a/fairmq/zeromq/TransportFactory.h
+++ b/fairmq/zeromq/TransportFactory.h
@@ -73,7 +73,10 @@ class TransportFactory final : public fair::mq::TransportFactory
         return std::make_unique<Message>(data, size, ffn, hint, this);
     }
 
-    MessagePtr CreateMessage(UnmanagedRegionPtr& region, void* data, size_t size, void* hint = 0) override
+    MessagePtr CreateMessage(UnmanagedRegionPtr& region,
+                             void* data,
+                             size_t size,
+                             void* hint = nullptr) override
     {
         return std::make_unique<Message>(region, data, size, hint, this);
     }