diff --git a/global-db/dap_global_db.c b/global-db/dap_global_db.c
index 58e57ed8dcdc90b23579ba004f30087fa576d15b..39ea93d1d07bbba9ee0da5f11434135841d1e4b5 100644
--- a/global-db/dap_global_db.c
+++ b/global-db/dap_global_db.c
@@ -1880,6 +1880,10 @@ static bool s_check_pinned_db_objs_callback() {
     return false;
 }
 
+static void s_check_pinned_db_objs_timer_callback(void* UNUSED_ARG a_arg) {
+    s_check_pinned_db_objs_callback();
+}
+
 static bool s_start_check_pinned_db_objs_callback() {
     int l_ret = dap_proc_thread_callback_add(NULL, s_check_pinned_db_objs_callback, NULL);
     if (l_ret != 0) {
@@ -1921,7 +1925,7 @@ static void s_set_pinned_timer(const char * a_group) {
             s_minimal_ttl = dap_nanotime_from_sec(l_cluster->ttl);
         s_check_pinned_db_objs_timer = dap_timerfd_start(dap_nanotime_to_millitime(s_minimal_ttl/2), 
                                                         (dap_timerfd_callback_t)s_start_check_pinned_db_objs_callback, NULL);
-        debug_if(g_dap_global_db_debug_more, L_INFO, "New pinned callback timer %llu sec", dap_nanotime_to_sec(s_minimal_ttl/2));
+        debug_if(g_dap_global_db_debug_more, L_INFO, "New pinned callback timer %"DAP_UINT64_FORMAT_U" sec", dap_nanotime_to_sec(s_minimal_ttl/2));
     }
 }
 
@@ -1976,7 +1980,7 @@ static int s_pinned_objs_group_init() {
         s_get_all_pinned_objs_in_group(l_ret, l_ret_count);
         dap_store_obj_free(l_ret, l_ret_count);
     }
-    dap_proc_thread_timer_add_pri(NULL, (dap_thread_timer_callback_t)s_check_pinned_db_objs_callback, NULL, 300000, true, DAP_QUEUE_MSG_PRIORITY_NORMAL);  // 5 min wait before repin
+    dap_proc_thread_timer_add_pri(NULL, (dap_thread_timer_callback_t)s_check_pinned_db_objs_timer_callback, NULL, 300000, true, DAP_QUEUE_MSG_PRIORITY_NORMAL);  // 5 min wait before repin
     return 0;
 }
 
diff --git a/plugin/src/dap_plugin.c b/plugin/src/dap_plugin.c
index f0e07493d5c6bb99319b714a6a48bb64bf88110b..4bf7ff2cf249c32feffe78dac94d6594366929d5 100644
--- a/plugin/src/dap_plugin.c
+++ b/plugin/src/dap_plugin.c
@@ -275,7 +275,7 @@ static int s_start(dap_plugin_manifest_t * a_manifest)
             return -1;
         }
         l_module->pvt_data = l_pvt_data;
-        strncpy(l_module->name, a_manifest->name, sizeof(l_module->name)-1);
+        dap_strncpy(l_module->name, a_manifest->name, sizeof(l_module->name));
         l_module->name[sizeof(l_module->name) - 1] = '\0';  // Warning avoid
         l_module->type = l_type;
         l_module->manifest = a_manifest;