diff --git a/inc/Message.hpp b/inc/Message.hpp
index cd7d27e065bd4f7e820c22a0228be4349b5b7dbe..53bfb031d2e13fe83ccdb5b5cb57d1f5b884ae0d 100644
--- a/inc/Message.hpp
+++ b/inc/Message.hpp
@@ -331,7 +331,7 @@ public:
 	 * PTC = 3, PFC = 16
 	 */
 	uint64_t readUint64() {
-		return ((uint64_t)readWord() << 32) |(uint64_t)readWord();
+		return (static_cast<uint64_t >(readWord()) << 32) | static_cast<uint64_t >(readWord());
 	}
 
 	/**
diff --git a/src/Services/MemMangService.cpp b/src/Services/MemMangService.cpp
index 97005e043206b548bba12ce131acd14f40f169c0..d9bbc777a25aa2930b66024405627ad532ec36a2 100644
--- a/src/Services/MemMangService.cpp
+++ b/src/Services/MemMangService.cpp
@@ -12,7 +12,7 @@ MemoryManagementService::RawDataMemoryManagement::RawDataMemoryManagement(
 
 
 // Function declarations for the raw data memory management subservice
-void MemoryManagementService::RawDataMemoryManagement::loadRawData(Message &request) {
+//void MemoryManagementService::RawDataMemoryManagement::loadRawData(Message &request) {
 	/**
 	 * Bare in mind that there is currently no error checking for invalid parameters.
 	 * A future version will include error checking and the corresponding error report/notification,
@@ -21,7 +21,7 @@ void MemoryManagementService::RawDataMemoryManagement::loadRawData(Message &requ
 	 * @todo Add error checking and reporting for the parameters
 	 * @todo Add failure reporting
 	 */
-	uint8_t memoryID = request.readEnum8(); // Read the memory ID from the request
+	/*uint8_t memoryID = request.readEnum8(); // Read the memory ID from the request
 	uint8_t iterationCount = 0; // Get the iteration count
 	uint16_t dataLength = 0; // Data length to read (updated for each new iteration)
 	uint32_t startAddress = 0; // Start address for the memory read (updated in each new iteration)
@@ -32,12 +32,12 @@ void MemoryManagementService::RawDataMemoryManagement::loadRawData(Message &requ
 
 	if (memoryID == MemoryManagementService::MemoryID::RAM) {
 		for (std::size_t i = 0; i < dataLength; i++) {
-			//*(uint64_t *)startAddress = memoryData[i];
+			//\*(uint64_t *)startAddress = memoryData[i];
 		}
 	} else if (memoryID == MemoryManagementService::MemoryID::FLASH) {
 
 	}
-}
+}*/
 
 void MemoryManagementService::RawDataMemoryManagement::dumpRawData(Message &request) {
 	// Create the report message object of telemetry message subtype 6