diff --git a/src/XML/wsp/AbstractOperatorContentType.php b/src/XML/wsp/AbstractOperatorContentType.php
index 62776727..abd009fc 100644
--- a/src/XML/wsp/AbstractOperatorContentType.php
+++ b/src/XML/wsp/AbstractOperatorContentType.php
@@ -35,7 +35,7 @@ abstract class AbstractOperatorContentType extends AbstractWspElement
      *         \SimpleSAML\WSSecurity\XML\wsp\PolicyReference)[] $operatorContent
      * @param \SimpleSAML\XML\Chunk[] $children
      */
-    public function __construct(
+    final public function __construct(
         protected array $operatorContent = [],
         array $children = []
     ) {
diff --git a/src/XML/wsp/AppliesTo.php b/src/XML/wsp/AppliesTo.php
index 0b2af5b0..aa92b444 100644
--- a/src/XML/wsp/AppliesTo.php
+++ b/src/XML/wsp/AppliesTo.php
@@ -32,8 +32,8 @@ final class AppliesTo extends AbstractWspElement
     /**
      * Initialize a wsp:AppliesTo
      *
-     * @param list<\SimpleSAML\XML\ElementInterface> $children
-     * @param list<\SimpleSAML\XML\Attribute> $namespacedAttributes
+     * @param array<\SimpleSAML\XML\SerializableElementInterface> $children
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(array $children = [], array $namespacedAttributes = [])
     {
diff --git a/src/XML/wsp/Policy.php b/src/XML/wsp/Policy.php
index 4414a9ec..79e2fd91 100644
--- a/src/XML/wsp/Policy.php
+++ b/src/XML/wsp/Policy.php
@@ -135,6 +135,7 @@ public static function fromXML(DOMElement $xml): static
                 'ExactlyOne' => ExactlyOne::fromXML($n),
                 'Policy' => Policy::fromXML($n),
                 'PolicyReference' => PolicyReference::fromXML($n),
+                default => null,
             };
         }
 
diff --git a/src/XML/wsp/PolicyAttachment.php b/src/XML/wsp/PolicyAttachment.php
index 4cbab15b..acb80602 100644
--- a/src/XML/wsp/PolicyAttachment.php
+++ b/src/XML/wsp/PolicyAttachment.php
@@ -43,8 +43,8 @@ final class PolicyAttachment extends AbstractWspElement
      *
      * @param \SimpleSAML\WSSecurity\XML\wsp\AppliesTo $appliesTo
      * @param (\SimpleSAML\WSSecurity\XML\wsp\Policy|\SimpleSAML\WSSecurity\XML\wsp\PolicyReference)[] $policies
-     * @param \SimpleSAML\XML\ElementInterface[] $children
-     * @param list<\SimpleSAML\XML\Attribute> $namespacedAttributes
+     * @param array<\SimpleSAML\XML\SerializableElementInterface> $children
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
         protected AppliesTo $appliesTo,
diff --git a/src/XML/wsse/AbstractAttributedString.php b/src/XML/wsse/AbstractAttributedString.php
index f0b1c69e..db5d5267 100644
--- a/src/XML/wsse/AbstractAttributedString.php
+++ b/src/XML/wsse/AbstractAttributedString.php
@@ -34,9 +34,9 @@ abstract class AbstractAttributedString extends AbstractWsseElement
      *
      * @param string $content
      * @param string|null $Id
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
-    public function __construct(
+    final public function __construct(
         string $content,
         protected ?string $Id = null,
         array $namespacedAttributes = []
diff --git a/src/XML/wsse/AbstractBinarySecurityTokenType.php b/src/XML/wsse/AbstractBinarySecurityTokenType.php
index e6d173cd..bbab2b2e 100644
--- a/src/XML/wsse/AbstractBinarySecurityTokenType.php
+++ b/src/XML/wsse/AbstractBinarySecurityTokenType.php
@@ -29,7 +29,7 @@ abstract class AbstractBinarySecurityTokenType extends AbstractEncodedString
      * @param string|null $valueType
      * @param string|null $Id
      * @param string|null $EncodingType
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         string $content,
diff --git a/src/XML/wsse/AbstractEmbeddedType.php b/src/XML/wsse/AbstractEmbeddedType.php
index 2fa00239..6a44c15e 100644
--- a/src/XML/wsse/AbstractEmbeddedType.php
+++ b/src/XML/wsse/AbstractEmbeddedType.php
@@ -34,8 +34,8 @@ abstract class AbstractEmbeddedType extends AbstractWsseElement
      * AbstractEmbeddedType constructor
      *
      * @param string|null $valueType
-     * @param \SimpleSAML\XML\SerializableElementInterface[] $children
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\SerializableElementInterface> $children
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         protected ?string $valueType = null,
diff --git a/src/XML/wsse/AbstractEncodedString.php b/src/XML/wsse/AbstractEncodedString.php
index fe518565..ee9c99e9 100644
--- a/src/XML/wsse/AbstractEncodedString.php
+++ b/src/XML/wsse/AbstractEncodedString.php
@@ -22,9 +22,9 @@ abstract class AbstractEncodedString extends AbstractAttributedString
      * @param string $content
      * @param string|null $Id
      * @param string|null $EncodingType
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
-    public function __construct(
+    final public function __construct(
         string $content,
         ?string $Id = null,
         protected ?string $EncodingType = null,
diff --git a/src/XML/wsse/AbstractKeyIdentifierType.php b/src/XML/wsse/AbstractKeyIdentifierType.php
index c76343c3..bf04224f 100644
--- a/src/XML/wsse/AbstractKeyIdentifierType.php
+++ b/src/XML/wsse/AbstractKeyIdentifierType.php
@@ -24,7 +24,7 @@ abstract class AbstractKeyIdentifierType extends AbstractEncodedString
      * @param string|null $valueType
      * @param string|null $Id
      * @param string|null $EncodingType
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         string $content,
diff --git a/src/XML/wsse/AbstractPasswordString.php b/src/XML/wsse/AbstractPasswordString.php
index 33e541a4..48d1a109 100644
--- a/src/XML/wsse/AbstractPasswordString.php
+++ b/src/XML/wsse/AbstractPasswordString.php
@@ -22,7 +22,7 @@ abstract class AbstractPasswordString extends AbstractAttributedString
      * @param string $content
      * @param string|null $Id
      * @param string|null $Type
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         string $content,
diff --git a/src/XML/wsse/AbstractReferenceType.php b/src/XML/wsse/AbstractReferenceType.php
index 823a6eee..0d641f0c 100644
--- a/src/XML/wsse/AbstractReferenceType.php
+++ b/src/XML/wsse/AbstractReferenceType.php
@@ -29,7 +29,7 @@ abstract class AbstractReferenceType extends AbstractWsseElement
      *
      * @param string|null $URI
      * @param string|null $valueType
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         protected ?string $URI = null,
diff --git a/src/XML/wsse/AbstractSecurityHeaderType.php b/src/XML/wsse/AbstractSecurityHeaderType.php
index d1598e40..930a6b3b 100644
--- a/src/XML/wsse/AbstractSecurityHeaderType.php
+++ b/src/XML/wsse/AbstractSecurityHeaderType.php
@@ -32,8 +32,8 @@ abstract class AbstractSecurityHeaderType extends AbstractWsseElement
     /**
      * AbstractSecurityHeaderType constructor
      *
-     * @param \SimpleSAML\XML\SerializableElementInterface[] $children
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\SerializableElementInterface> $children
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         array $children = [],
diff --git a/src/XML/wsse/AbstractSecurityTokenReferenceType.php b/src/XML/wsse/AbstractSecurityTokenReferenceType.php
index 1136dd48..0d61b7a5 100644
--- a/src/XML/wsse/AbstractSecurityTokenReferenceType.php
+++ b/src/XML/wsse/AbstractSecurityTokenReferenceType.php
@@ -39,8 +39,8 @@ abstract class AbstractSecurityTokenReferenceType extends AbstractWsseElement
      *
      * @param string|null $Id
      * @param string|null $Usage
-     * @param \SimpleSAML\XML\SerializableElementInterface[] $children
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\SerializableElementInterface> $children
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         protected ?string $Id = null,
diff --git a/src/XML/wsse/AbstractTransformationParametersType.php b/src/XML/wsse/AbstractTransformationParametersType.php
index 5618a369..31d305b9 100644
--- a/src/XML/wsse/AbstractTransformationParametersType.php
+++ b/src/XML/wsse/AbstractTransformationParametersType.php
@@ -32,8 +32,8 @@ abstract class AbstractTransformationParametersType extends AbstractWsseElement
     /**
      * TransformationParametersType constructor
      *
-     * @param \SimpleSAML\XML\SerializableElementInterface[] $children
-     * @param array $namespacedAttributes
+     * @param array<\SimpleSAML\XML\SerializableElementInterface> $children
+     * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
         array $children = [],