diff --git a/src/Services/MemMangService.cpp b/src/Services/MemMangService.cpp
index d9bbc777a25aa2930b66024405627ad532ec36a2..6f157e3d57e367634babd03b3b3747aedb0f3b5a 100644
--- a/src/Services/MemMangService.cpp
+++ b/src/Services/MemMangService.cpp
@@ -65,7 +65,7 @@ void MemoryManagementService::RawDataMemoryManagement::dumpRawData(Message &requ
 
 	readData = static_cast<uint8_t *>( malloc(static_cast<std::size_t >(readLength)) );
 	for (std::size_t i = 0; i < readLength; i++) {
-		readData[i] = *((uint8_t *)((std::size_t)startAddress) + i);
+		readData[i] = *(reinterpret_cast<uint8_t *>(startAddress) + i);
 	}
 
 	report.appendOctetString(readLength, readData);
diff --git a/src/main.cpp b/src/main.cpp
index 60f82b7ad24d8af7e3f111420c4a4e72d09fcef9..b59f3fcfa56d1470f65cea3a3d1b6d444c9700e8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,7 +33,7 @@ int main() {
 	Message rcvPack = Message(6, 2, Message::TC, 1);
 	rcvPack.appendEnum8(MemoryManagementService::MemoryID::RAM); // Memory ID
 	rcvPack.appendUint16(1); // Iteration count
-	rcvPack.appendUint64(static_cast<uint64_t >((std::size_t)(string))); // Start address
+	rcvPack.appendUint64(static_cast<uint64_t >(reinterpret_cast<std::size_t >(string))); // Start address
 	rcvPack.appendUint16(sizeof(string)/ sizeof(string[0])); // Data read length
 	memMangService.rawDataMemorySubservice.dumpRawData(rcvPack);