diff --git a/src/parser/neu_json_driver.c b/src/parser/neu_json_driver.c
index 75826f20..e62738b1 100644
--- a/src/parser/neu_json_driver.c
+++ b/src/parser/neu_json_driver.c
@@ -32,7 +32,7 @@ int neu_json_decode_driver_action_req_json(void *                    json_obj,
 
     neu_json_elem_t req_elems[] = {
         {
-            .name = "driver",
+            .name = "node",
             .t    = NEU_JSON_STR,
         },
         {
diff --git a/src/utils/cid.c b/src/utils/cid.c
index 9ee3bf6e..50945e2c 100644
--- a/src/utils/cid.c
+++ b/src/utils/cid.c
@@ -1362,7 +1362,7 @@ static void ld_ctrl_do_to_group(const char *ied_name, const char *ap_name,
                     tag->type = NEU_TYPE_UINT16;
                     break;
                 case Timestamp:
-                    tag->type = NEU_TYPE_INT64;
+                    tag->type = NEU_TYPE_UINT64;
                     break;
                 case VisString32:
                     tag->type = NEU_TYPE_STRING;
@@ -1525,7 +1525,7 @@ static void ln_dataset_to_group(const char *ied_name, const char *ap_name,
                         tag->type = NEU_TYPE_UINT16;
                         break;
                     case Timestamp:
-                        tag->type = NEU_TYPE_INT64;
+                        tag->type = NEU_TYPE_UINT64;
                         break;
                     case VisString32:
                         tag->type = NEU_TYPE_STRING;