diff --git a/internalError/InternalErrorReporter.cpp b/internalError/InternalErrorReporter.cpp
index a41d4568..22e2c38c 100644
--- a/internalError/InternalErrorReporter.cpp
+++ b/internalError/InternalErrorReporter.cpp
@@ -159,6 +159,7 @@ ReturnValue_t InternalErrorReporter::initializeLocalDataPool(
             new PoolEntry<uint32_t>());
     poolManager.subscribeForPeriodicPacket(internalErrorSid, false,
             getPeriodicOperationFrequency(), true);
+    internalErrorDataset.setValidity(true, true);
     return HasReturnvaluesIF::RETURN_OK;
 }
 
diff --git a/pus/Service3Housekeeping.cpp b/pus/Service3Housekeeping.cpp
index c668ec8e..3f41f541 100644
--- a/pus/Service3Housekeeping.cpp
+++ b/pus/Service3Housekeeping.cpp
@@ -205,7 +205,7 @@ ReturnValue_t Service3Housekeeping::handleReply(const CommandMessage* reply,
     }
     case(HousekeepingMessage::DIAGNOSTICS_DEFINITION_REPORT): {
         return generateHkReply(reply, static_cast<uint8_t>(
-                Subservice::DIAGNOSTICS_REPORT));
+                Subservice::DIAGNOSTICS_DEFINITION_REPORT));
         break;
     }