diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
index ea1fcdf1d..08a15d5ff 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
@@ -824,7 +824,7 @@ void DeviceHandlerBase::handleReply(const uint8_t* receivedData, DeviceCommandId
 }
 
 ReturnValue_t DeviceHandlerBase::getStorageData(store_address_t storageAddress, uint8_t** data,
-                                                uint32_t* len) {
+                                                size_t* len) {
   size_t lenTmp;
 
   if (IPCStore == nullptr) {
diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.h b/src/fsfw/devicehandlers/DeviceHandlerBase.h
index 037f4bd75..c8b8b86d7 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@@ -673,7 +673,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
   //! Pointer to the raw packet that will be sent.
   uint8_t *rawPacket = nullptr;
   //! Size of the #rawPacket.
-  uint32_t rawPacketLen = 0;
+  size_t rawPacketLen = 0;
 
   /**
    * The mode the device handler is currently in.
@@ -1250,7 +1250,7 @@ class DeviceHandlerBase : public DeviceHandlerIF,
    *   - @c RETURN_FAILED IPCStore is nullptr
    *   - the return value from the IPCStore if it was not @c RETURN_OK
    */
-  ReturnValue_t getStorageData(store_address_t storageAddress, uint8_t **data, uint32_t *len);
+  ReturnValue_t getStorageData(store_address_t storageAddress, uint8_t **data, size_t *len);
 
   /**
    * @param modeTo either @c MODE_ON, MODE_NORMAL or MODE_RAW, nothing else!