diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp
index a9482733..c226938b 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp
@@ -155,7 +155,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
         SPM = 0xA0,
 
         /**
-         * The REGISTER_FILE memory type can be used to read  &write to general purpose registers.
+         * The REGISTER_FILE memory type can be used to read & write to general purpose registers.
          *
          * Only available in debugging mode and with XMEGA and UPDI config variants. The SRAM memory type can be used
          * to access general purpose registers when other variants are in use.
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 10429c51..3a591f7c 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
@@ -489,13 +489,16 @@ void EdbgAvr8Interface::configure(const TargetConfig& targetConfig) {
 
     if (!this->family.has_value()) {
         if (this->physicalInterface == PhysicalInterface::JTAG) {
-            throw InvalidConfig("Cannot use JTAG physical interface with ambiguous target name - please specify the"
-                " exact name of the target in your configuration file. See https://bloom.oscillate.io/docs/supported-targets");
+            throw InvalidConfig("The JTAG physical interface cannot be used with an ambiguous target name"
+                " - please specify the exact name of the target in your configuration file. "
+                "See https://bloom.oscillate.io/docs/supported-targets"
+            );
 
         } else if (this->physicalInterface == PhysicalInterface::UPDI) {
-            throw InvalidConfig("Cannot use UPDI physical interface with ambiguous target name - please "
-                "specify the exact name of the target in your configuration file. "
-                "See https://bloom.oscillate.io/docs/supported-targets");
+            throw InvalidConfig("The UPDI physical interface cannot be used with an ambiguous target name"
+                " - please specify the exact name of the target in your configuration file. "
+                "See https://bloom.oscillate.io/docs/supported-targets"
+            );
         }
     }
 
diff --git a/src/TargetController/TargetController.cpp b/src/TargetController/TargetController.cpp
index ea21b49e..e982d6ac 100644
--- a/src/TargetController/TargetController.cpp
+++ b/src/TargetController/TargetController.cpp
@@ -237,7 +237,6 @@ void TargetController::resume() {
         std::bind(&TargetController::onSetPinStateEvent, this, std::placeholders::_1)
     );
 
-    Logger::debug("TC resumed");
     this->state = TargetControllerState::ACTIVE;
     this->eventManager.triggerEvent(
         std::make_shared<TargetControllerStateReported>(this->state)
diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
index b85e2f64..93d7a1f9 100644
--- a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
+++ b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
@@ -93,8 +93,7 @@ void Avr8::loadTargetParameters() {
             auto cpuInstance = cpuPeripheralModule.instancesMappedByName.at("cpu");
 
             if (cpuInstance.registerGroupsMappedByName.contains("cpu")) {
-                auto cpuRegisterGroup = cpuInstance.registerGroupsMappedByName.at("cpu");
-                cpuRegistersOffset = cpuRegisterGroup.offset.value_or(0);
+                cpuRegistersOffset = cpuInstance.registerGroupsMappedByName.at("cpu").offset.value_or(0);
             }
         }
     }