diff --git a/projects/rdc/example/topologylink_example.cc b/projects/rdc/example/topologylink_example.cc
index b45ed231f5..4bf4d41c97 100644
--- a/projects/rdc/example/topologylink_example.cc
+++ b/projects/rdc/example/topologylink_example.cc
@@ -28,7 +28,6 @@ THE SOFTWARE.
 static const char* topology_link_type_to_str(rdc_topology_link_type_t type) {
   if (type == RDC_IOLINK_TYPE_PCIEXPRESS) return "RDC_IOLINK_TYPE_PCIEXPRESS";
   if (type == RDC_IOLINK_TYPE_XGMI) return "RDC_IOLINK_TYPE_XGMI";
-  if (type == RDCI_IOLINK_TYPE_NUMIOLINKTYPES) return "RDCI_IOLINK_TYPE_NUMIOLINKTYPES";
   return "Unknown_Type";
 }
 int main() {
@@ -161,4 +160,4 @@ cleanup:
     rdc_stop_embedded(rdc_handle);
   rdc_shutdown();
   return result;
-}
\ No newline at end of file
+}
diff --git a/projects/rdc/include/rdc/rdc.h b/projects/rdc/include/rdc/rdc.h
index 288ab00220..c6f655cf85 100644
--- a/projects/rdc/include/rdc/rdc.h
+++ b/projects/rdc/include/rdc/rdc.h
@@ -709,7 +709,6 @@ typedef enum {
   RDC_IOLINK_TYPE_UNDEFINED = 0,     //!< unknown type.
   RDC_IOLINK_TYPE_PCIEXPRESS = 1,    //!< PCI Express
   RDC_IOLINK_TYPE_XGMI = 2,          //!< XGMI
-  RDCI_IOLINK_TYPE_NUMIOLINKTYPES,   //!< Number of IO Link types
   RDC_IOLINK_TYPE_SIZE = 0xFFFFFFFF  //!< Max of IO Link types
 } rdc_topology_link_type_t;
 
diff --git a/projects/rdc/rdc_libs/rdc/src/RdcWatchTableImpl.cc b/projects/rdc/rdc_libs/rdc/src/RdcWatchTableImpl.cc
index 8bdf18a736..fc2c5de698 100644
--- a/projects/rdc/rdc_libs/rdc/src/RdcWatchTableImpl.cc
+++ b/projects/rdc/rdc_libs/rdc/src/RdcWatchTableImpl.cc
@@ -106,6 +106,17 @@ rdc_status_t RdcWatchTableImpl::rdc_job_start_stats(rdc_gpu_group_t group_id, co
 
   // At last, when every thing sets up, starts to watch the fields.
   result = rdc_field_watch(group_id, JOB_FIELD_ID, update_freq, 0, 0);
+  if (result != RDC_ST_OK) {
+    return result;
+  }
+
+  std::vector<RdcFieldKey> proc_events;
+  for (uint32_t ix = 0; ix < ginfo.count; ++ix) {
+    uint32_t gpu = ginfo.entity_ids[ix];
+    proc_events.emplace_back(gpu, RDC_EVNT_NOTIF_PROCESS_START);
+    proc_events.emplace_back(gpu, RDC_EVNT_NOTIF_PROCESS_END);
+  }
+  result = notifications_->set_listen_events(proc_events);
   return result;
 }
 
diff --git a/projects/rdc/rdc_libs/rdc_client/src/RdcStandaloneHandler.cc b/projects/rdc/rdc_libs/rdc_client/src/RdcStandaloneHandler.cc
index 6b92a2ea0f..9bd0c28297 100644
--- a/projects/rdc/rdc_libs/rdc_client/src/RdcStandaloneHandler.cc
+++ b/projects/rdc/rdc_libs/rdc_client/src/RdcStandaloneHandler.cc
@@ -171,7 +171,7 @@ rdc_status_t RdcStandaloneHandler::rdc_job_get_stats(const char job_id[64],
   }
 
   p_job_info->num_processes = reply.num_processes();
-  for (int i = 0; i < reply.num_processes(); i++) {
+  for (uint32_t i = 0; i < reply.num_processes(); i++) {
     const auto& proc_msg = reply.processes(i);
     p_job_info->processes[i].pid = proc_msg.pid();