diff --git a/inc/ECSS_Definitions.hpp b/inc/ECSS_Definitions.hpp
index 38b44d007fc205b0a9483e82d6286cd83c7490af..e9b97e010b22869ae9d5066afcf113e6302ce16f 100644
--- a/inc/ECSS_Definitions.hpp
+++ b/inc/ECSS_Definitions.hpp
@@ -157,7 +157,7 @@ inline const uint16_t LoggerMaxMessageSize = 512;
 /**
  * @brief Size of the map holding references to each Parameter object for the ST[20] parameter service
  */
-inline const uint8_t ECSSParameterCount = 250;
+inline const uint8_t ECSSParameterCount = 500;
 
 /**
  * @brief Defines whether the optional CRC field is included
diff --git a/inc/Time/TimeStamp.hpp b/inc/Time/TimeStamp.hpp
index 499fb3c66ac9869be384e9fde471e4eb903d5c05..52fade25ad8dd9ff8c8fd078bf6f940e6d8b3bc7 100644
--- a/inc/Time/TimeStamp.hpp
+++ b/inc/Time/TimeStamp.hpp
@@ -45,7 +45,7 @@ private:
 	 * The maximum value that can fit in @ref taiCounter, or the maximum number of seconds since epoch that can be
 	 * represented in this base class
 	 */
-	static constexpr uint64_t maxSecondCounterValue = (1U << (8U * secondsBytes)) - 1;
+	static constexpr uint64_t maxSecondCounterValue = (uint64_t{1U} << (8U * secondsBytes)) - 1;
 
 	/**
 	 * Returns whether the amount of `seconds` can be represented by this TimeStamp.