diff --git a/core/include/dap_common.h b/core/include/dap_common.h
index 3f631be7cf5ae11d527aad5d74b48e8e48b140b4..ba771572db8448889b35da6b52efe4a6b1741542 100755
--- a/core/include/dap_common.h
+++ b/core/include/dap_common.h
@@ -859,6 +859,10 @@ static const uint16_t s_ascii_table_data[256] = {
 #define dap_ascii_isprint(c) (s_ascii_table_data[(unsigned char) (c)] & DAP_ASCII_PRINT)
 #define dap_ascii_isxdigit(c) (s_ascii_table_data[(unsigned char) (c)] & DAP_ASCII_XDIGIT)
 
+#define DAP_FLAG_ADD(a, flag) ((a) | (flag))
+#define DAP_FLAG_REMOVE(a, flag) ((a) & ~(flag))
+#define DAP_FLAG_CHECK(a, flag) ((a) & (flag))
+
 static void * ( *const volatile memset_safe ) (void*, int, size_t) = memset;
 
 DAP_STATIC_INLINE void DAP_AtomicLock( dap_spinlock_t *lock )
diff --git a/core/include/dap_time.h b/core/include/dap_time.h
index 26a2878aa0fab3c2595a7e69536e339e155b679a..a2ec6cdb0e17f673c09a30ddf70a66cca5d1c7d9 100644
--- a/core/include/dap_time.h
+++ b/core/include/dap_time.h
@@ -57,4 +57,4 @@ int dap_nanotime_to_str_rfc822(char *a_out, size_t a_out_size_max, dap_nanotime_
 int timespec_diff(struct timespec *a_start, struct timespec *a_stop, struct timespec *a_result);
 
 dap_time_t dap_time_from_str_simplified(const char *a_time_str);
-
+dap_time_t dap_time_from_str_custom(const char *a_time_str, const char *a_format_str);
diff --git a/core/src/dap_time.c b/core/src/dap_time.c
index fc1108c3884e2707d1673c18343c26a96e669251..39141655ee827b3c3861ffb01912b951f3eb00aa 100644
--- a/core/src/dap_time.c
+++ b/core/src/dap_time.c
@@ -207,3 +207,20 @@ int dap_nanotime_to_str_rfc822(char *a_out, size_t a_out_size_max, dap_nanotime_
     time_t l_time = dap_nanotime_to_sec(a_chain_time);
     return dap_time_to_str_rfc822(a_out, a_out_size_max, l_time);
 }
+
+/**
+ * @brief Convert time str to dap_time_t by custom format
+ * @param a_time_str
+ * @param a_format_str
+ * @return time from string or 0 if bad time format
+ */
+dap_time_t dap_time_from_str_custom(const char *a_time_str, const char *a_format_str)
+{
+    dap_return_val_if_pass(!a_time_str || !a_format_str, 0);
+    struct tm l_tm = {};
+    char *ret = strptime(a_time_str, a_format_str, &l_tm);
+    if ( !ret || *ret )
+        return log_it(L_ERROR, "Invalid timestamp \"%s\" by format \"%s\"", a_time_str, a_format_str), 0;
+    time_t tmp = mktime(&l_tm);
+    return tmp > 0 ? (dap_time_t)tmp : 0;
+}
\ No newline at end of file
diff --git a/global-db/dap_global_db.c b/global-db/dap_global_db.c
index cb4dde542ce947b2d85728c23ecd3568c7909867..09b0987aaa7eb7ea74899a1c60fadb2d54154dfb 100644
--- a/global-db/dap_global_db.c
+++ b/global-db/dap_global_db.c
@@ -1387,7 +1387,7 @@ int dap_global_db_del_ex(const char * a_group, const char *a_key, const void * a
     l_msg->callback_arg = a_arg;
     l_msg->callback_result = a_callback;
     if (a_value_len) {
-        l_msg->value = DAP_DUP_SIZE(a_value, a_value_len);
+        l_msg->value = DAP_DUP_SIZE((void *)a_value, a_value_len);
         l_msg->value_length = a_value_len;
     }
 
diff --git a/net/server/cli_server/dap_cli_server.c b/net/server/cli_server/dap_cli_server.c
index 7a42efeab3f9aae55a6f8d38540011719cea4e24..1d2e9d6914d78227675a02c723e6cf780dbb70fe 100644
--- a/net/server/cli_server/dap_cli_server.c
+++ b/net/server/cli_server/dap_cli_server.c
@@ -262,7 +262,8 @@ int json_commands(const char * a_name) {
             "stats",
             "print_log",
             "stake_lock",
-            "exec_cmd"            
+            "exec_cmd",
+            "policy"
     };
     for (size_t i = 0; i < sizeof(long_cmd)/sizeof(long_cmd[0]); i++) {
         if (!strcmp(a_name, long_cmd[i])) {
diff --git a/net/server/json_rpc/rpc_core/src/dap_json_rpc_response.c b/net/server/json_rpc/rpc_core/src/dap_json_rpc_response.c
index d5769c9f386478a3d05b1145ec70ab75a40548c0..d5ea2f6b3269e7003d9426c660a2a99ccb15b088 100644
--- a/net/server/json_rpc/rpc_core/src/dap_json_rpc_response.c
+++ b/net/server/json_rpc/rpc_core/src/dap_json_rpc_response.c
@@ -212,7 +212,7 @@ void json_print_value(json_object *obj, const char *key, int indent_level, bool
             printf(print_separator ? "%s, " : "%s", json_object_get_string(obj));
             break;
         case json_type_int:
-            printf("%d", json_object_get_int(obj));
+            printf("%lld", json_object_get_int64(obj));
             break;
         case json_type_double:
             printf("%lf", json_object_get_double(obj));