diff --git a/src/Date/Date.cpp b/src/Date/Date.cpp
index bfa93d2..94aa52b 100644
--- a/src/Date/Date.cpp
+++ b/src/Date/Date.cpp
@@ -10,7 +10,7 @@ namespace Tesses::Framework::Date
 {
     int GetTimeZone()
     {
-        #if defined(__SWITCH__) || defined(_WIN32)
+        #if defined(__SWITCH__) || defined(_WIN32) || defined(GEKKO)
         return (int)(-_timezone);
 	    #else
         return (int)(-timezone);
@@ -18,7 +18,7 @@ namespace Tesses::Framework::Date
     }
     bool TimeZoneSupportDST()
     {
-        #if defined(__SWITCH__) || defined(_WIN32)
+        #if defined(__SWITCH__) || defined(_WIN32) || defined(GEKKO)
         return _daylight == 1;
         #else
         return daylight == 1;
diff --git a/src/Threading/Thread.cpp b/src/Threading/Thread.cpp
index 9cb3ff8..487d6f0 100644
--- a/src/Threading/Thread.cpp
+++ b/src/Threading/Thread.cpp
@@ -56,7 +56,7 @@ namespace Tesses::Framework::Threading
                 joinning=false;
                 hasExited=false;
                 #if defined(GEKKO)
-                    LWP_CreateThread(&thrd, cb, static_cast<void*>(this), nullptr,12000, 98);
+                    LWP_CreateThread(&thrd, this->cb, static_cast<void*>(this), nullptr,12000, 98);
                 #elif defined(__SWITCH__)
                 TF_LOG("Before Thread create");
                 Result    rc = threadCreate(&thrd,this->cb,
@@ -152,10 +152,8 @@ namespace Tesses::Framework::Threading
         HANDLE thrd;
         DWORD thrdId;
       
-        public:
-        #elif defined(GEKKO)
-        lwp_t thrd;
-    
+       
+       
         #elif defined(__SWITCH__) || defined(GEKKO)
             std::shared_ptr<NeedToBeJoinnedThread> thread;
         #else