diff --git a/utils/meta_parameters.rb b/utils/meta_parameters.rb
index d0c217ed..2c3be8c7 100644
--- a/utils/meta_parameters.rb
+++ b/utils/meta_parameters.rb
@@ -217,7 +217,7 @@ def initialize(command, name, size)
       size = "*#{size}"
       size = "(#{size} < 0 ? 0 : (size_t)#{size})" if INT_SIGN_MAP["#{s.type.type}"]
       sz = sanitize_expression("#{size}", checks)
-      st = INT_SIGN_MAP["#{s.type.type}"] ? "size_t"  : "#{s.type}"
+      st = INT_SIGN_MAP["#{s.type.type}"] ? "size_t"  : "#{s.type.type}"
     else
       checks = check_for_null("#{name}")
       size = "(#{size} < 0 ? 0 : (size_t)#{size})" if INT_SIGN_MAP["#{s.type}"]
diff --git a/utils/yaml_ast_lttng.rb b/utils/yaml_ast_lttng.rb
index acce44aa..6016dabc 100644
--- a/utils/yaml_ast_lttng.rb
+++ b/utils/yaml_ast_lttng.rb
@@ -184,6 +184,7 @@ def lttng_type(length: nil, length_type: nil)
           ev.type = :uint8_t
           if ev.length
             ev.length = "(#{ev.length}) * sizeof(uint8_t)"
+            ev.length_type = "size_t"
           end
         when *OBJECT_TYPES, *POINTER_TYPES
           ev.macro = :"ctf_#{lttng_arr_type}_hex"
@@ -202,6 +203,7 @@ def lttng_type(length: nil, length_type: nil)
           ev.type = :uint8_t
           if ev.length
             ev.length = "(#{ev.length}) * sizeof(#{type.name})"
+            ev.length_type = "size_t"
           end
         else
           super
diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index 1d3c4a5d..ddd7c9c4 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -314,7 +314,7 @@ def env_tracers
   end
 
   # Sample
-  if OPTIONS[:sample]
+  if OPTIONS[:sample] && mpi_local_master?
     h['LTTNG_UST_SAMPLING'] = 1
     h['LTTNG_UST_SAMPLING_ENERGY'] = 1
     h['ZES_ENABLE_SYSMAN'] = 1 if OPTIONS[:'backend-names'].include?('ze')
diff --git a/ze/tracer_ze_helpers.include.c b/ze/tracer_ze_helpers.include.c
index 27685d8c..281279dd 100644
--- a/ze/tracer_ze_helpers.include.c
+++ b/ze/tracer_ze_helpers.include.c
@@ -787,8 +787,8 @@ static int _sampling_freq_initialized = 0;
 static int _sampling_pwr_initialized = 0;
 static int _sampling_engines_initialized = 0;
 // Static handles to stay throughout the execution
-static ze_driver_handle_t*  _sampling_hDrivers = NULL;
-static ze_device_handle_t** _sampling_hDevices = NULL;
+static zes_driver_handle_t*  _sampling_hDrivers = NULL;
+static zes_device_handle_t** _sampling_hDevices = NULL;
 static zes_freq_handle_t*** _sampling_hFrequencies = NULL;
 static zes_pwr_handle_t*** _sampling_hPowers = NULL;
 static zes_engine_handle_t*** _sampling_engineHandles = NULL;
@@ -908,53 +908,49 @@ static int initializeHandles() {
     fprintf(stderr,"ZES_ENABLE_SYSMAN needs to be set!\n");
     return -1;
   }
-#ifdef CALL_ZEINIT
-  res = zeInit(ZE_INIT_FLAG_GPU_ONLY);
-  if (res != ZE_RESULT_SUCCESS) {
-    _ZE_ERROR_MSG("zeInit", res);
-    return -1;
-  }
-#endif
 
   // Query driver
   _sampling_driverCount = 0;
-  res = ZE_DRIVER_GET_PTR(&_sampling_driverCount, NULL);
+  res = ZES_DRIVER_GET_PTR(&_sampling_driverCount, NULL);
   if (res != ZE_RESULT_SUCCESS) {
-    _ZE_ERROR_MSG("1st ZE_DRIVER_GET_PTR", res);
+    _ZE_ERROR_MSG("1st ZES_DRIVER_GET_PTR", res);
     return -1;
   }
-  _sampling_hDrivers = (ze_driver_handle_t*) calloc(_sampling_driverCount, sizeof(ze_driver_handle_t));
-  res = ZE_DRIVER_GET_PTR(&_sampling_driverCount, _sampling_hDrivers);
+  _sampling_hDrivers = (zes_driver_handle_t*) calloc(_sampling_driverCount, sizeof(zes_driver_handle_t));
+  res = ZES_DRIVER_GET_PTR(&_sampling_driverCount, _sampling_hDrivers);
   if (res != ZE_RESULT_SUCCESS) {
-    _ZE_ERROR_MSG("2nd ZE_DRIVER_GET_PTR", res);
+    _ZE_ERROR_MSG("2nd ZES_DRIVER_GET_PTR", res);
     return -1;
   }
   _sampling_deviceCount = (uint32_t*) calloc(_sampling_driverCount, sizeof(uint32_t));
   _sampling_subDeviceCount = (uint32_t**) calloc(_sampling_driverCount, sizeof(uint32_t*));
-  _sampling_hDevices = (ze_device_handle_t**) calloc(_sampling_driverCount, sizeof(ze_device_handle_t*));
+  _sampling_hDevices = (zes_device_handle_t**) calloc(_sampling_driverCount, sizeof(zes_device_handle_t*));
   // Query device count
   for (uint32_t driverIdx = 0; driverIdx < _sampling_driverCount; driverIdx++) {
-    res = ZE_DEVICE_GET_PTR(_sampling_hDrivers[driverIdx], &_sampling_deviceCount[driverIdx], NULL);
+    res = ZES_DEVICE_GET_PTR(_sampling_hDrivers[driverIdx], &_sampling_deviceCount[driverIdx], NULL);
     if (res != ZE_RESULT_SUCCESS || _sampling_deviceCount[driverIdx] == 0) {
       fprintf(stderr, "ERROR: No device found!\n");
-      _ZE_ERROR_MSG("1st ZE_DEVICE_GET_PTR", res);
+      _ZE_ERROR_MSG("1st ZES_DEVICE_GET_PTR", res);
       return -1;
     }
-    _sampling_hDevices[driverIdx] = (ze_device_handle_t*) calloc(_sampling_deviceCount[driverIdx], sizeof(ze_device_handle_t));
-    res = ZE_DEVICE_GET_PTR(_sampling_hDrivers[driverIdx], &_sampling_deviceCount[driverIdx], _sampling_hDevices[driverIdx]);
+    _sampling_hDevices[driverIdx] = (zes_device_handle_t*) calloc(_sampling_deviceCount[driverIdx], sizeof(zes_device_handle_t));
+    res = ZES_DEVICE_GET_PTR(_sampling_hDrivers[driverIdx], &_sampling_deviceCount[driverIdx], _sampling_hDevices[driverIdx]);
     if (res != ZE_RESULT_SUCCESS) {
-      _ZE_ERROR_MSG("2nd ZE_DEVICE_GET_PTR", res);
+      _ZE_ERROR_MSG("2nd ZES_DEVICE_GET_PTR", res);
       free(_sampling_hDevices[driverIdx]);
       return -1;
     }
     //Get no sub-devices
     _sampling_subDeviceCount[driverIdx] = (uint32_t*) calloc(_sampling_deviceCount[driverIdx], sizeof(uint32_t));
     for (uint32_t deviceIdx = 0; deviceIdx < _sampling_deviceCount[driverIdx]; deviceIdx++) {
-      res = ZE_DEVICE_GET_SUB_DEVICES_PTR(_sampling_hDevices[driverIdx][deviceIdx], &_sampling_subDeviceCount[driverIdx][deviceIdx], NULL);
+      zes_device_properties_t deviceProperties = {0};
+      deviceProperties.stype = ZES_STRUCTURE_TYPE_DEVICE_PROPERTIES;
+      res = ZES_DEVICE_GET_PROPERTIES_PTR(_sampling_hDevices[driverIdx][deviceIdx], &deviceProperties);
       if (res != ZE_RESULT_SUCCESS) {
-        _ZE_ERROR_MSG("ZE_DEVICE_GET_SUB_DEVICES_PTR", res);
+        _ZE_ERROR_MSG("ZES_DEVICE_GET_PROPERTIES_PTR", res);
         _sampling_subDeviceCount[driverIdx][deviceIdx] = 0;
-      }
+      } else
+        _sampling_subDeviceCount[driverIdx][deviceIdx] = deviceProperties.numSubdevices;
       if (_sampling_subDeviceCount[driverIdx][deviceIdx] == 0) {
         _sampling_subDeviceCount[driverIdx][deviceIdx] = 1;
       }