diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
index abaa42b0..ed111ca9 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
@@ -34,7 +34,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
     public function getAdditionalDeviceAttributes(): array
     {
         return [
-            'avr-family' => $this->getAvrFamily()->value,
+            'avr-family' => $this->getAvrFamily()->value ?? '',
         ];
     }
 
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/DiscoveryService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/DiscoveryService.php
index 578363cc..21b592fe 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/DiscoveryService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/DiscoveryService.php
@@ -20,7 +20,7 @@ class DiscoveryService
 
         $directory = new \DirectoryIterator($directoryPath);
         foreach ($directory as $entry) {
-            if ($entry->isFile() && $entry->getExtension() == 'xml') {
+            if ($entry->isFile() && $entry->getExtension() === 'xml') {
                 $output[] = clone $entry;
 
             } elseif ($entry->isDir() && !$entry->isDot()) {
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
index 5eca7ab7..d6cbc4be 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
@@ -328,11 +328,6 @@ class FromXmlService
 
             if ($childNode->nodeName === 'register-group-instance') {
                 $output->registerGroupInstances[] = $this->registerGroupInstanceFromElement($childNode);
-                continue;
-            }
-
-            if ($childNode->nodeName === 'signal') {
-                $output->signals[] = $this->signalFromElement($childNode);
             }
         }