diff --git a/iceoryx_dds/source/iceoryx_dds/dds/cyclone_data_reader.cpp b/iceoryx_dds/source/iceoryx_dds/dds/cyclone_data_reader.cpp
index 55f152d992..fc730da430 100644
--- a/iceoryx_dds/source/iceoryx_dds/dds/cyclone_data_reader.cpp
+++ b/iceoryx_dds/source/iceoryx_dds/dds/cyclone_data_reader.cpp
@@ -76,10 +76,10 @@ iox::cxx::expected<uint64_t, iox::dds::DataReaderError> iox::dds::CycloneDataRea
     }
 
     // Read up to the maximum number of samples that can fit in the buffer.
-    auto samples = m_impl.select().max_samples(maxSamples).state(::dds::sub::status::SampleState::not_read()).take();
+    auto samples = m_impl.select().max_samples(static_cast<uint32_t>(maxSamples)).state(::dds::sub::status::SampleState::not_read()).take();
 
     // Copy data into the provided buffer.
-    auto numSamplesBuffered = 0u;
+    uint64_t numSamplesBuffered = 0u;
     if (samples.length() > 0)
     {
         // Sample validation checks
@@ -92,7 +92,7 @@ iox::cxx::expected<uint64_t, iox::dds::DataReaderError> iox::dds::CycloneDataRea
         }
 
         // Do copy
-        uint8_t cursor = 0; // Tracks the position in the buffer to write next sample.
+        uint64_t cursor = 0; // Tracks the position in the buffer to write next sample.
         for (const auto& sample : samples)
         {
             auto bytes = sample.data().payload().data();
diff --git a/iceoryx_dds/source/iceoryx_dds/dds/cyclone_data_writer.cpp b/iceoryx_dds/source/iceoryx_dds/dds/cyclone_data_writer.cpp
index ef44f0a2e8..91000dcf03 100644
--- a/iceoryx_dds/source/iceoryx_dds/dds/cyclone_data_writer.cpp
+++ b/iceoryx_dds/source/iceoryx_dds/dds/cyclone_data_writer.cpp
@@ -55,12 +55,14 @@ void iox::dds::CycloneDataWriter::write(const uint8_t* const bytes, const uint64
 iox::dds::IdString iox::dds::CycloneDataWriter::getServiceId() const noexcept
 {
     return m_serviceId;
-};
+}
+
 iox::dds::IdString iox::dds::CycloneDataWriter::getInstanceId() const noexcept
 {
     return m_instanceId;
-};
+}
+
 iox::dds::IdString iox::dds::CycloneDataWriter::getEventId() const noexcept
 {
     return m_eventId;
-};
+}