diff --git a/jerry-core/debugger/debugger.c b/jerry-core/debugger/debugger.c
index aa4a309d69021f77e679e66fb02667d2385f72f5..54fd7cf31b5bef5b3bbbd8fe872db201f663100c 100644
--- a/jerry-core/debugger/debugger.c
+++ b/jerry-core/debugger/debugger.c
@@ -24,6 +24,9 @@
 #include "jcontext.h"
 #include "jerryscript-port.h"
 #include "lit-char-helpers.h"
+#if defined (__APPLE__)
+    #include <time.h>
+#endif
 
 #if ENABLED (JERRY_DEBUGGER)
 
@@ -1165,6 +1168,11 @@ jerry_debugger_receive (jerry_debugger_uint8_data_t **message_data_p) /**< [out]
 
   while (true)
   {
+    #if defined (__APPLE__)
+        // wait at here for 0.5ms
+        usleep(500)
+    #endif /* __APPLE__ */
+
     jerry_debugger_transport_receive_context_t context;
     if (!jerry_debugger_transport_receive (&context))
     {
diff --git a/jerry-port/default/default-date.c b/jerry-port/default/default-date.c
index edc6c99155f7e6697bbf4e5a6e2a9c0ec449a664..61ea64877fd49fde71401c04592f7df325b3e387 100755
--- a/jerry-port/default/default-date.c
+++ b/jerry-port/default/default-date.c
@@ -33,16 +33,12 @@
 
 #ifdef JERRY_FOR_IAR_CONFIG
 #define _BSD_SOURCE
+/* the "sys/time.h" should be put ahead of "time.h" so that the right implementation for gettimeofday can be found. */
+#include "sys/time.h"
 #include "time.h"
 #include "config-gt.h"
 #include "config-jupiter.h"
-
-#define GET_SIGN_BIT(x) ((x) >> sizeof (x) * 8 - 1)
-#define GET_TIMEZONE_HOUR(timeZone) (((timeZone) >> 8) & 0x7F)
-#define GET_TIMEZONE_MIN(timeZone) ((timeZone) & 0xFF)
-#define HOUR_TO_MIN 60
-#define MIN_TO_SEC 60
-#endif
+#endif /* JERRY_FOR_IAR_CONFIG */
 
 #ifdef _WIN32
 /* https://support.microsoft.com/en-us/help/167296/how-to-convert-a-unix-time-t-to-a-win32-filetime-or-systemtime */
@@ -77,9 +73,7 @@ double jerry_port_get_local_time_zone_adjustment (double unix_ms,  /**< ms since
   }
   return ((double) tm.tm_gmtoff) * 1000;
 #else /* !HAVE_TM_GMTOFF */
-#ifdef JERRY_FOR_IAR_CONFIG
-  // We don't use unix_ms and is_utc, since timezone cannot be computed
-  // as a function of given time.
+#ifdef JERRY_IAR_JUPITER
   struct tm tm;
   time_t now = (time_t) (unix_ms / 1000);
   localtime_r (&now, &tm);
@@ -89,7 +83,7 @@ double jerry_port_get_local_time_zone_adjustment (double unix_ms,  /**< ms since
     localtime_r (&now, &tm);
   }
   return ((double) tm.tm_gmtoff) * 1000;
-#else
+#else /* !JERRY_IAR_JUPITER */
   (void) unix_ms;
   (void) is_utc;
 #ifdef _WIN32
@@ -126,21 +120,14 @@ double jerry_port_get_local_time_zone_adjustment (double unix_ms,  /**< ms since
  */
 double jerry_port_get_current_time (void)
 {
-#ifdef __GNUC__
-  struct timeval tv;
+#if defined (__GNUC__) || defined (JERRY_IAR_JUPITER)
+  struct timeval tv = {0};
 
   if (gettimeofday (&tv, NULL) == 0)
   {
     return ((double) tv.tv_sec) * 1000.0 + ((double) tv.tv_usec) / 1000.0;
   }
-#endif /* __GNUC__ */
-
-#ifdef JERRY_FOR_IAR_CONFIG
-  time_t millis = 0;
-  if (time (&millis) != OHOS_FAILURE) {
-    return (double) millis * 1000.0;
-  }
-#endif
+#endif /* __GNUC__ || JERRY_IAR_JUPITER */
 
 #ifdef _WIN32
   time_t ltime;
diff --git a/jerry-port/default/default-io.c b/jerry-port/default/default-io.c
index 0788ae699527485bd6af16e40db5f33b5307bda2..a009ae4be7f6be1cc68e818982e413087e32f474 100644
--- a/jerry-port/default/default-io.c
+++ b/jerry-port/default/default-io.c
@@ -94,7 +94,7 @@ jerry_port_log (jerry_log_level_t level, /**< message log level */
       JERRY_VLA (char, buffer, length + 1);
       vsnprintf (buffer, (size_t) length + 1, format, args);
 
-      fprintf (stderr, "%s", buffer);
+      fprintf (stderr, "[JERRYSCRIPT]%s", buffer);
       jerry_debugger_send_log (level, (jerry_char_t *) buffer, (jerry_size_t) length);
     }
     else