diff --git a/src/libemane/eventstatisticpublisher.cc b/src/libemane/eventstatisticpublisher.cc
index 752b99d..ebbeaa5 100644
--- a/src/libemane/eventstatisticpublisher.cc
+++ b/src/libemane/eventstatisticpublisher.cc
@@ -112,8 +112,8 @@ void EMANE::EventStatisticPublisher::update(Type type, const uuid_t & uuid, Even
           pEventCountTable_->addRow(key,
                                     {Any{eventId},
                                         Any{buf},
-                                          Any{0L},
-                                            Any{0L}});
+                                          Any{std::uint64_t{0}},
+                                            Any{std::uint64_t{0}}});
         }
     }
 
diff --git a/src/libemane/otastatisticpublisher.cc b/src/libemane/otastatisticpublisher.cc
index c54310b..cc60074 100644
--- a/src/libemane/otastatisticpublisher.cc
+++ b/src/libemane/otastatisticpublisher.cc
@@ -112,8 +112,8 @@ void EMANE::OTAStatisticPublisher::update(Type type, const uuid_t & uuid, NEMId
           pPacketCountTable_->addRow(key,
                                      {Any{nemId},
                                          Any{buf},
-                                           Any{0L},
-                                             Any{0L}});
+                                           Any{std::uint64_t{0}},
+                                             Any{std::uint64_t{0}}});
         }
     }
 
diff --git a/src/models/mac/tdma/aggregationstatuspublisher.cc b/src/models/mac/tdma/aggregationstatuspublisher.cc
index 6b344f3..4e9a2b1 100644
--- a/src/models/mac/tdma/aggregationstatuspublisher.cc
+++ b/src/models/mac/tdma/aggregationstatuspublisher.cc
@@ -58,7 +58,7 @@ void EMANE::Models::TDMA::AggregationStatusPublisher::update(const MessageCompon
 
       pAggregationHistogramTable_->addRow(u64NumberComponents,
                                           {Any{u64NumberComponents},
-                                              Any{1L}});
+                                              Any{std::uint64_t{1}}});
     }
   else
     {
diff --git a/src/models/mac/tdma/packetstatuspublisherimpl.cc b/src/models/mac/tdma/packetstatuspublisherimpl.cc
index 5bd20f4..5bd0731 100644
--- a/src/models/mac/tdma/packetstatuspublisherimpl.cc
+++ b/src/models/mac/tdma/packetstatuspublisherimpl.cc
@@ -219,8 +219,8 @@ void EMANE::Models::TDMA::PacketStatusPublisherImpl::inbound(NEMId src,
 
           (*pAcceptTables)[u8QueueIndex]->addRow(src,
                                                  {Any{src},
-                                                     Any{0L},
-                                                       Any{0L}});
+                                                     Any{std::uint64_t{0}},
+                                                       Any{std::uint64_t{0}}});
         }
 
       auto & bytes = std::get<ACCEPT_COLUMN_NUM_BYTES_RX-1>(iter->second);
@@ -243,18 +243,18 @@ void EMANE::Models::TDMA::PacketStatusPublisherImpl::inbound(NEMId src,
 
           (*pDropTables)[u8QueueIndex]->addRow(src,
                                                {Any{src},
-                                                   Any{0L},
-                                                     Any{0L},
-                                                       Any{0L},
-                                                         Any{0L},
-                                                           Any{0L},
-                                                             Any{0L},
-                                                               Any{0L},
-                                                                 Any{0L},
-                                                                   Any{0L},
-                                                                     Any{0L},
-                                                                       Any{0L},
-                                                                         Any{0L}});
+                                                   Any{std::uint64_t{0}},
+                                                     Any{std::uint64_t{0}},
+                                                       Any{std::uint64_t{0}},
+                                                         Any{std::uint64_t{0}},
+                                                           Any{std::uint64_t{0}},
+                                                             Any{std::uint64_t{0}},
+                                                               Any{std::uint64_t{0}},
+                                                                 Any{std::uint64_t{0}},
+                                                                   Any{std::uint64_t{0}},
+                                                                     Any{std::uint64_t{0}},
+                                                                       Any{std::uint64_t{0}},
+                                                                         Any{std::uint64_t{0}}});
         }
 
       switch(action)
@@ -428,8 +428,8 @@ void EMANE::Models::TDMA::PacketStatusPublisherImpl::outbound(NEMId src,
 
           (*pAcceptTables)[u8QueueIndex]->addRow(src,
                                                  {Any{src},
-                                                     Any{0L},
-                                                       Any{0L}});
+                                                     Any{std::uint64_t{0}},
+                                                       Any{std::uint64_t{0}}});
         }
 
       auto & bytes = std::get<ACCEPT_COLUMN_NUM_BYTES_TX-1>(iter->second);
@@ -452,18 +452,18 @@ void EMANE::Models::TDMA::PacketStatusPublisherImpl::outbound(NEMId src,
 
           (*pDropTables)[u8QueueIndex]->addRow(src,
                                                {Any{src},
-                                                   Any{0L},
-                                                     Any{0L},
-                                                       Any{0L},
-                                                         Any{0L},
-                                                           Any{0L},
-                                                             Any{0L},
-                                                               Any{0L},
-                                                                 Any{0L},
-                                                                   Any{0L},
-                                                                     Any{0L},
-                                                                       Any{0L},
-                                                                         Any{0L}});
+                                                   Any{std::uint64_t{0}},
+                                                     Any{std::uint64_t{0}},
+                                                       Any{std::uint64_t{0}},
+                                                         Any{std::uint64_t{0}},
+                                                           Any{std::uint64_t{0}},
+                                                             Any{std::uint64_t{0}},
+                                                               Any{std::uint64_t{0}},
+                                                                 Any{std::uint64_t{0}},
+                                                                   Any{std::uint64_t{0}},
+                                                                     Any{std::uint64_t{0}},
+                                                                       Any{std::uint64_t{0}},
+                                                                         Any{std::uint64_t{0}}});
         }
 
       switch(action)
diff --git a/src/models/mac/tdma/slotstatustablepublisher.cc b/src/models/mac/tdma/slotstatustablepublisher.cc
index e64d83d..9bf26b2 100644
--- a/src/models/mac/tdma/slotstatustablepublisher.cc
+++ b/src/models/mac/tdma/slotstatustablepublisher.cc
@@ -106,17 +106,17 @@ void EMANE::Models::TDMA::SlotStatusTablePublisher::updateTx(std::uint32_t u32Re
                                {Any{u32RelativeIndex},
                                    Any{u32RelativeSlotIndex},
                                      Any{u32RelativeFrameIndex},
-                                       Any{0L},
-                                         Any{0L},
-                                           Any{0L},
-                                             Any{0L},
-                                               Any{0L},
-                                                 Any{0L},
-                                                   Any{0L},
-                                                       Any{0L},
-                                                         Any{0L},
-                                                           Any{0L},
-                                                             Any{0L}});
+                                       Any{std::uint64_t{0}},
+                                         Any{std::uint64_t{0}},
+                                           Any{std::uint64_t{0}},
+                                             Any{std::uint64_t{0}},
+                                               Any{std::uint64_t{0}},
+                                                 Any{std::uint64_t{0}},
+                                                   Any{std::uint64_t{0}},
+                                                       Any{std::uint64_t{0}},
+                                                         Any{std::uint64_t{0}},
+                                                           Any{std::uint64_t{0}},
+                                                             Any{std::uint64_t{0}}});
 
     }
 
@@ -195,20 +195,20 @@ void EMANE::Models::TDMA::SlotStatusTablePublisher::updateRx(std::uint32_t u32Re
                                   {Any{u32RelativeIndex},
                                       Any{u32RelativeSlotIndex},
                                         Any{u32RelativeFrameIndex},
-                                          Any{0L},
-                                            Any{0L},
-                                              Any{0L},
-                                                Any{0L},
-                                                  Any{0L},
-                                                    Any{0L},
-                                                      Any{0L},
-                                                        Any{0L},
-                                                          Any{0L},
-                                                            Any{0L},
-                                                              Any{0L},
-                                                                Any{0L},
-                                                                  Any{0L},
-                                                                    Any{0L}});
+                                          Any{std::uint64_t{0}},
+                                            Any{std::uint64_t{0}},
+                                              Any{std::uint64_t{0}},
+                                                Any{std::uint64_t{0}},
+                                                  Any{std::uint64_t{0}},
+                                                    Any{std::uint64_t{0}},
+                                                      Any{std::uint64_t{0}},
+                                                        Any{std::uint64_t{0}},
+                                                          Any{std::uint64_t{0}},
+                                                            Any{std::uint64_t{0}},
+                                                              Any{std::uint64_t{0}},
+                                                                Any{std::uint64_t{0}},
+                                                                  Any{std::uint64_t{0}},
+                                                                    Any{std::uint64_t{0}}});
 
     }