diff --git a/inc/Services/TimeBasedSchedulingService.hpp b/inc/Services/TimeBasedSchedulingService.hpp
index e748b25f3447d52f363ad08331f9748d0ec05448..575b03595e94158a5dae3b4e219d903ba608f942 100644
--- a/inc/Services/TimeBasedSchedulingService.hpp
+++ b/inc/Services/TimeBasedSchedulingService.hpp
@@ -76,13 +76,14 @@ private:
 	 *
 	 * @details All scheduled activities must contain the request they exist for, their release
 	 * time and the corresponding request identifier.
+	 *
+	 * @todo If we decide to use sub-schedules, the ID of that has to be defined
+	 * @todo If groups are used, then the group ID has to be defined here
 	 */
 	struct ScheduledActivity {
 		Message request; ///< Hold the received command request
 		RequestID requestID; ///< Request ID, characteristic of the definition
 		uint32_t requestReleaseTime = 0; ///< Keep the command release time
-		// todo: If we decide to use sub-schedules, the ID of that has to be defined
-		// todo: If groups are used, then the group ID has to be defined here
 	};
 
 	/**
diff --git a/src/Helpers/TimeAndDate.cpp b/src/Helpers/TimeAndDate.cpp
index 29903d17009fd9b292c20e99b26067e8dea4f442..54a17b6b17f0ca2838f741222858fc97777f25ae 100644
--- a/src/Helpers/TimeAndDate.cpp
+++ b/src/Helpers/TimeAndDate.cpp
@@ -17,6 +17,7 @@ TimeAndDate::TimeAndDate(uint16_t year, uint8_t month, uint8_t day, uint8_t hour
 	ASSERT_INTERNAL((1 <= day) && (day <= 31), ErrorHandler::InternalErrorType::InvalidDate);
 	ASSERT_INTERNAL(hour < 24, ErrorHandler::InternalErrorType::InvalidDate);
 	ASSERT_INTERNAL(minute < 60, ErrorHandler::InternalErrorType::InvalidDate);
+	// Seconds can be equal to 60, to account for leap seconds.
 	ASSERT_INTERNAL(second <= 60, ErrorHandler::InternalErrorType::InvalidDate);
 
 	this->year = year;