diff --git a/projects/amdsmi/amdsmi_cli/amdsmi_cli_exceptions.py b/projects/amdsmi/amdsmi_cli/amdsmi_cli_exceptions.py
index e42fc9f9f2..c61e7d94bc 100644
--- a/projects/amdsmi/amdsmi_cli/amdsmi_cli_exceptions.py
+++ b/projects/amdsmi/amdsmi_cli/amdsmi_cli_exceptions.py
@@ -119,7 +119,7 @@ class AmdSmiDeviceNotFoundException(AmdSmiException):
         self.command = command
         self.output_format = outputformat
 
-        common_message = f"Can not find a GPU with the corresponding identifier: '{self.command}'"
+        common_message = f"Can not find a device with the corresponding identifier: '{self.command}'"
 
         self.json_message["error"] = common_message
         self.json_message["code"] = self.value
diff --git a/projects/amdsmi/amdsmi_cli/amdsmi_helpers.py b/projects/amdsmi/amdsmi_cli/amdsmi_helpers.py
index 91879e721c..23ec7ce58d 100644
--- a/projects/amdsmi/amdsmi_cli/amdsmi_helpers.py
+++ b/projects/amdsmi/amdsmi_cli/amdsmi_helpers.py
@@ -385,7 +385,7 @@ class AMDSMIHelpers():
 
         selected_device_handles = []
         for core_selection in core_selections:
-            valid_cpu_choice = False
+            valid_core_choice = False
             for core_id, core_info in core_choices.items():
                 device_handle = core_info['Device Handle']
 
diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py
index c3e6400683..a59d288fef 100644
--- a/projects/amdsmi/py-interface/amdsmi_interface.py
+++ b/projects/amdsmi/py-interface/amdsmi_interface.py
@@ -1246,8 +1246,8 @@ def amdsmi_get_cpu_socket_lclk_dpm_level(
     _check_res(amdsmi_wrapper.amdsmi_get_cpu_socket_lclk_dpm_level(processor_handle, nbio_id, dpm_level))
 
     return {
-        "nbio_max_dpm_level": nbio.max_dpm_level,
-        "nbio_min_dpm_level": nbio.min_dpm_level
+        "nbio_max_dpm_level": dpm_level.max_dpm_level,
+        "nbio_min_dpm_level": dpm_level.min_dpm_level
     }
 
 def amdsmi_set_cpu_pcie_link_rate(