diff --git a/inc/ECSS_Definitions.hpp b/inc/ECSS_Definitions.hpp
index f8f70ee2453b5ef1252cba4e491c4ca12e49b091..de8033326c5e80391f4729fd889124f331bcc919 100644
--- a/inc/ECSS_Definitions.hpp
+++ b/inc/ECSS_Definitions.hpp
@@ -9,7 +9,7 @@
 #define CCSDS_PACKET_VERSION 0
 
 // 7.4.4.1c
-#define ECSS_PUS_VERSION 2
+#define ECSS_PUS_VERSION 2U
 
 // 9.3.1a.1.e
 #define ECSS_SEQUENCE_FLAGS 0x3
@@ -34,11 +34,11 @@
 // todo: Define the maximum number of activities
 #define ECSS_MAX_NUMBER_OF_TIME_SCHED_ACTIVITIES    10
 
-// todo: Define the time margin for the command activation
 /**
  * @brief Time margin used in the time based command scheduling service ST[11]
  * @details This defines the time margin in seconds, from the current rime, that an activity must
  * have in order
+ * @todo Define the time margin for the command activation
  */
 #define ECSS_TIME_MARGIN_FOR_ACTIVATION  60
 
diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index 9d379a0e1eed8bd297c34b6fa31fe03c54ff23ff..6ac29c0531184da62bbd617f94189fb240995cf6 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -34,12 +34,12 @@ void EventActionService::addEventActionDefinitions(Message message) {
 			eventActionDefinitionArray[index].enabled = true;
 			eventActionDefinitionArray[index].applicationId = applicationID;
 			eventActionDefinitionArray[index].eventDefinitionID = eventDefinitionID;
-			if (message.dataSize - 4 > ECSS_EVENT_SERVICE_STRING_SIZE) {
+			if (message.dataSize - 4 > ECSS_TC_REQUEST_STRING_SIZE) {
 				ErrorHandler::reportInternalError(ErrorHandler::InternalErrorType::MessageTooLarge);
 			} else {
-				char data[ECSS_EVENT_SERVICE_STRING_SIZE];
+				char data[ECSS_TC_REQUEST_STRING_SIZE];
 				message.readString(data, message.dataSize - 4);
-				eventActionDefinitionArray[index].request = String<ECSS_EVENT_SERVICE_STRING_SIZE>(
+				eventActionDefinitionArray[index].request = String<ECSS_TC_REQUEST_STRING_SIZE>(
 					data);
 			}
 		}