diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp
index cc3abfb8..0eb2404a 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/AVR8Generic/SetParameter.hpp
@@ -14,8 +14,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
              * The set param command consists of value.size() + 5 bytes. The first five bytes consist of:
              * 1. Command ID (0x01)
              * 2. Version (0x00)
-             * 3. Param context (Avr8Parameter::context)
-             * 4. Param ID (Avr8Parameter::id)
+             * 3. Param context (Avr8EdbgParameter::context)
+             * 4. Param ID (Avr8EdbgParameter::id)
              * 5. Param value length (value.size()) - this is only one byte in size, so its value should
              *    never exceed 255.
              */
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
index bfa44697..11d76b3b 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
@@ -5,6 +5,7 @@
 
 #include "src/Logger/Logger.hpp"
 #include "src/Helpers/Paths.hpp"
+#include "src/Helpers/String.hpp"
 
 #include "src/Exceptions/InvalidConfig.hpp"
 #include "src/TargetController/Exceptions/DeviceInitializationFailure.hpp"
@@ -987,6 +988,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
             SetParameter(parameter, value)
         );
 
+        Logger::debug(
+            "Setting AVR8 EDBG parameter (context: 0x" + String::toHex(parameter.context) + ", id: 0x"
+                + String::toHex(parameter.id) + ", value: 0x" + String::toHex(value) + ")"
+        );
+
         if (responseFrame.id == Avr8ResponseId::FAILED) {
             throw Avr8CommandFailure("Failed to set parameter on device!", responseFrame);
         }