diff --git a/src/TargetController/Commands/CommandTypes.hpp b/src/TargetController/Commands/CommandTypes.hpp
index c540b5ff..465d405a 100644
--- a/src/TargetController/Commands/CommandTypes.hpp
+++ b/src/TargetController/Commands/CommandTypes.hpp
@@ -14,9 +14,9 @@ namespace Bloom::TargetController::Commands
         READ_TARGET_REGISTERS,
         WRITE_TARGET_REGISTERS,
         READ_TARGET_MEMORY,
+        WRITE_TARGET_MEMORY,
         GET_TARGET_STATE,
         STEP_TARGET_EXECUTION,
-        WRITE_TARGET_MEMORY,
         SET_BREAKPOINT,
         REMOVE_BREAKPOINT,
         SET_PROGRAM_COUNTER,
diff --git a/src/TargetController/Commands/SetProgramCounter.hpp b/src/TargetController/Commands/SetProgramCounter.hpp
index 7ded4e70..4147be2d 100644
--- a/src/TargetController/Commands/SetProgramCounter.hpp
+++ b/src/TargetController/Commands/SetProgramCounter.hpp
@@ -16,7 +16,6 @@ namespace Bloom::TargetController::Commands
 
         std::uint32_t address = 0;
 
-        SetProgramCounter() = default;
         explicit SetProgramCounter(std::uint32_t address)
             : address(address)
         {};
diff --git a/src/TargetController/TargetControllerComponent.cpp b/src/TargetController/TargetControllerComponent.cpp
index 15e1ffe4..0c59d623 100644
--- a/src/TargetController/TargetControllerComponent.cpp
+++ b/src/TargetController/TargetControllerComponent.cpp
@@ -178,6 +178,7 @@ namespace Bloom::TargetController
         std::string,
         std::function<std::unique_ptr<DebugTool>()>
     > TargetControllerComponent::getSupportedDebugTools() {
+        // The debug tool names in this mapping should always be lower-case.
         return std::map<std::string, std::function<std::unique_ptr<DebugTool>()>> {
             {
                 "atmel-ice",
@@ -407,7 +408,6 @@ namespace Bloom::TargetController
 
         this->eventListener->deregisterCallbacksForEventType<Events::DebugSessionFinished>();
         this->eventListener->deregisterCallbacksForEventType<Events::ExtractTargetDescriptor>();
-        this->eventListener->deregisterCallbacksForEventType<Events::InsightThreadStateChanged>();
         this->eventListener->deregisterCallbacksForEventType<Events::RetrieveStackPointerFromTarget>();
 
         this->lastTargetState = TargetState::UNKNOWN;