diff --git a/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp
index a983754d..3e93e7dd 100644
--- a/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp
+++ b/src/DebugToolDrivers/Microchip/Protocols/EDBG/AVR/EdbgAvr8Interface.cpp
@@ -327,6 +327,9 @@ namespace DebugToolDrivers::Microchip::Protocols::Edbg::Avr
              *
              * So it appears we cannot use that command for UPDI sessions. For this reason, we will just read the
              * signature from memory via the signature memory segment.
+             *
+             * TODO: We're assuming the signature memory segment will always reside in the `data` address space, for
+             *       UPDI targets. Review.
              */
             const auto signatureMemory = this->readMemory(
                 Avr8MemoryType::SRAM,
diff --git a/src/Targets/Microchip/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR8/Avr8.cpp
index 9eb7a9d3..00e364b5 100644
--- a/src/Targets/Microchip/AVR8/Avr8.cpp
+++ b/src/Targets/Microchip/AVR8/Avr8.cpp
@@ -323,11 +323,7 @@ namespace Targets::Microchip::Avr8
             );
         }
 
-        /*
-         * The debug interface may have its own access restrictions for registers.
-         *
-         * We must amend the register descriptors with the appropriate restrictions.
-         */
+        // The debug interface may have its own access restrictions for registers.
         for (auto& [peripheralKey, peripheral] : descriptor.peripheralDescriptorsByKey) {
             for (auto& [groupKey, registerGroup] : peripheral.registerGroupDescriptorsByKey) {
                 this->applyDebugInterfaceRegisterAccessRestrictions(