diff --git a/RPi-Pico/config/user_settings.h b/RPi-Pico/config/user_settings.h
index 3bec06248..1a2bb4d51 100644
--- a/RPi-Pico/config/user_settings.h
+++ b/RPi-Pico/config/user_settings.h
@@ -27,12 +27,15 @@
 #ifndef WOLFSSL_USER_SETTINGS_H
 #define WOLFSSL_USER_SETTINGS_H
 
+#define WOLFSSL_AUTOSAR
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 #include <stdio.h>
+#include <time.h>
 #define TARGET_EMBEDDED
 
 extern time_t myTime(time_t *);
diff --git a/RPi-Pico/src/wifi_main.c b/RPi-Pico/src/Wifi_main.c
similarity index 100%
rename from RPi-Pico/src/wifi_main.c
rename to RPi-Pico/src/Wifi_main.c
diff --git a/RPi-Pico/src/bench_main.c b/RPi-Pico/src/bench_main.c
index eed0d33b9..1878d08ba 100644
--- a/RPi-Pico/src/bench_main.c
+++ b/RPi-Pico/src/bench_main.c
@@ -47,6 +47,11 @@ int main(int argc, char **argv)
 #include <time.h>
 time_t myTime(time_t *t)
 {
-    *t = (((2023 - 1970) * 12 + 8) * 30 * 24 * 60 * 60);
-    return *t;
-}
\ No newline at end of file
+    time_t t_ret = (((2023 - 1970) * 365 + (8 * 30)) * 24 * 60 * 60);
+
+    if (t != NULL) {
+        *t = t_ret;
+    }
+
+    return t_ret;
+}
diff --git a/RPi-Pico/src/test_main.c b/RPi-Pico/src/test_main.c
index 8c224a6a2..79574a6f9 100644
--- a/RPi-Pico/src/test_main.c
+++ b/RPi-Pico/src/test_main.c
@@ -48,6 +48,11 @@ int main(int argc, char **argv)
 #include <time.h>
 time_t myTime(time_t *t)
 {
-    *t = (((2023 - 1970) * 12 + 8) * 30 * 24 * 60 * 60);
-    return *t;
-}
\ No newline at end of file
+    time_t t_ret = (((2023 - 1970) * 365 + (8 * 30)) * 24 * 60 * 60);
+
+    if (t != NULL) {
+        *t = t_ret;
+    }
+
+    return t_ret;
+}
diff --git a/RPi-Pico/src/tlsClient_main.c b/RPi-Pico/src/tlsClient_main.c
index 7b384ea4d..6ed583bcd 100644
--- a/RPi-Pico/src/tlsClient_main.c
+++ b/RPi-Pico/src/tlsClient_main.c
@@ -190,6 +190,11 @@ void lwip_example_app_platform_assert(const char *msg, int line, const char *fil
 #include <time.h>
 time_t myTime(time_t *t)
 {
-    *t = (((2023 - 1970) * 365 + (8 * 30)) * 24 * 60 * 60);
-    return *t;
-}
\ No newline at end of file
+    time_t t_ret = (((2023 - 1970) * 365 + (8 * 30)) * 24 * 60 * 60);
+
+    if (t != NULL) {
+        *t = t_ret;
+    }
+
+    return t_ret;
+}