diff --git a/hal/src/fsfw_hal/linux/rpi/GpioRPi.cpp b/hal/src/fsfw_hal/linux/rpi/GpioRPi.cpp
index e1c274c0c..b42a4c897 100644
--- a/hal/src/fsfw_hal/linux/rpi/GpioRPi.cpp
+++ b/hal/src/fsfw_hal/linux/rpi/GpioRPi.cpp
@@ -7,7 +7,7 @@
 
 
 ReturnValue_t gpio::createRpiGpioConfig(GpioCookie* cookie, gpioId_t gpioId, int bcmPin,
-        std::string consumer, gpio::Direction direction, int initValue) {
+        std::string consumer, gpio::Direction direction, gpio::Levels initValue) {
     if(cookie == nullptr) {
         return HasReturnvaluesIF::RETURN_FAILED;
     }
diff --git a/hal/src/fsfw_hal/linux/rpi/GpioRPi.h b/hal/src/fsfw_hal/linux/rpi/GpioRPi.h
index 54917e6d0..d13faef45 100644
--- a/hal/src/fsfw_hal/linux/rpi/GpioRPi.h
+++ b/hal/src/fsfw_hal/linux/rpi/GpioRPi.h
@@ -20,7 +20,7 @@ namespace gpio {
  * @return
  */
 ReturnValue_t createRpiGpioConfig(GpioCookie* cookie, gpioId_t gpioId, int bcmPin,
-        std::string consumer, gpio::Direction direction, int initValue);
+        std::string consumer, gpio::Direction direction, gpio::Levels initValue);
 }
 
 #endif /* BSP_RPI_GPIO_GPIORPI_H_ */
diff --git a/src/fsfw/osal/linux/Clock.cpp b/src/fsfw/osal/linux/Clock.cpp
index d79c72be7..8f133b460 100644
--- a/src/fsfw/osal/linux/Clock.cpp
+++ b/src/fsfw/osal/linux/Clock.cpp
@@ -108,8 +108,6 @@ ReturnValue_t Clock::getUptime(uint32_t* uptimeMs) {
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
-
-
 ReturnValue_t Clock::getDateAndTime(TimeOfDay_t* time) {
 	timespec timeUnix;
 	int status = clock_gettime(CLOCK_REALTIME,&timeUnix);
diff --git a/src/fsfw/timemanager/Clock.h b/src/fsfw/timemanager/Clock.h
index b1d6bfafb..7116adb7a 100644
--- a/src/fsfw/timemanager/Clock.h
+++ b/src/fsfw/timemanager/Clock.h
@@ -99,6 +99,14 @@ public:
 	 */
 	static ReturnValue_t getDateAndTime(TimeOfDay_t *time);
 
+	/**
+	 * Convert to time of day struct given the POSIX timeval struct
+	 * @param from
+	 * @param to
+	 * @return
+	 */
+	static ReturnValue_t convertTimevalToTimeOfDay(const timeval *from,
+	        TimeOfDay_t *to);
 	/**
 	 * Converts a time of day struct to POSIX seconds.
 	 * @param time The time of day as input
diff --git a/src/fsfw/timemanager/ClockCommon.cpp b/src/fsfw/timemanager/ClockCommon.cpp
index 82c65b965..86866d7ae 100644
--- a/src/fsfw/timemanager/ClockCommon.cpp
+++ b/src/fsfw/timemanager/ClockCommon.cpp
@@ -42,6 +42,20 @@ ReturnValue_t Clock::getLeapSeconds(uint16_t *leapSeconds_) {
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
+ReturnValue_t Clock::convertTimevalToTimeOfDay(const timeval* from, TimeOfDay_t* to) {
+    struct tm* timeInfo;
+    timeInfo = gmtime(&from->tv_sec);
+    to->year = timeInfo->tm_year + 1900;
+    to->month = timeInfo->tm_mon+1;
+    to->day = timeInfo->tm_mday;
+    to->hour = timeInfo->tm_hour;
+    to->minute = timeInfo->tm_min;
+    to->second = timeInfo->tm_sec;
+    to->usecond = from->tv_usec;
+    return HasReturnvaluesIF::RETURN_OK;
+}
+
+
 ReturnValue_t Clock::checkOrCreateClockMutex() {
 	if (timeMutex == nullptr) {
 		MutexFactory *mutexFactory = MutexFactory::instance();