diff --git a/src/Builder/FormBuilder.php b/src/Builder/FormBuilder.php
index 5f77b946b..111c9f83f 100644
--- a/src/Builder/FormBuilder.php
+++ b/src/Builder/FormBuilder.php
@@ -845,12 +845,10 @@ private function getShippingOptions(string $tab): array
         ];
 
         foreach ($carriers as $carrier) {
-            $mappedCarrier = [];
-
-            $mappedCarrier['id'] = $carrier->id;
-            $mappedCarrier['name'] = $carrier->name;
-
-            $mappedCarriers[] = $mappedCarrier;
+            $mappedCarriers[] = [
+                'id' => $carrier->id,
+                'name' => $carrier->name,
+            ];
         }
 
         $header = [
diff --git a/src/Exception/CouldNotCreateOrderPaymentFee.php b/src/Exception/CouldNotCreateOrderPaymentFee.php
index dd7919550..0ac620f71 100644
--- a/src/Exception/CouldNotCreateOrderPaymentFee.php
+++ b/src/Exception/CouldNotCreateOrderPaymentFee.php
@@ -7,7 +7,7 @@
 
 class CouldNotCreateOrderPaymentFee extends MollieException
 {
-    public static function failedToInsertOrderPaymentFee(Exception $exception): CouldNotCreateOrderPaymentFee
+    public static function failedToInsertOrderPaymentFee(Exception $exception): self
     {
         return new self(
             'Failed to insert order payment fee.',
diff --git a/src/Exception/CouldNotInstallModule.php b/src/Exception/CouldNotInstallModule.php
index 9ff488ae8..c9fd4b06c 100644
--- a/src/Exception/CouldNotInstallModule.php
+++ b/src/Exception/CouldNotInstallModule.php
@@ -6,7 +6,7 @@
 
 class CouldNotInstallModule extends MollieException
 {
-    public static function failedToInstallOrderState(string $orderStateName, \Exception $exception): CouldNotInstallModule
+    public static function failedToInstallOrderState(string $orderStateName, \Exception $exception): self
     {
         return new self(
             sprintf('Failed to install order state (%s).', $orderStateName),
diff --git a/src/Exception/CouldNotUpdateOrderTotals.php b/src/Exception/CouldNotUpdateOrderTotals.php
index 6c8625bbc..69bda3404 100644
--- a/src/Exception/CouldNotUpdateOrderTotals.php
+++ b/src/Exception/CouldNotUpdateOrderTotals.php
@@ -7,7 +7,7 @@
 
 class CouldNotUpdateOrderTotals extends MollieException
 {
-    public static function failedToUpdateOrderTotals(Exception $exception): CouldNotUpdateOrderTotals
+    public static function failedToUpdateOrderTotals(Exception $exception): self
     {
         return new self(
             'Failed to update order totals.',
diff --git a/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php b/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php
index cab968358..077c1f55a 100644
--- a/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php
+++ b/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php
@@ -8,7 +8,7 @@
 
 class CouldNotHandleOrderPaymentFee extends MollieException
 {
-    public static function failedToRetrievePaymentMethod(Throwable $exception): CouldNotHandleOrderPaymentFee
+    public static function failedToRetrievePaymentMethod(Throwable $exception): self
     {
         return new self(
             'Failed to retrieve payment method',
@@ -17,7 +17,7 @@ public static function failedToRetrievePaymentMethod(Throwable $exception): Coul
         );
     }
 
-    public static function failedToRetrievePaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee
+    public static function failedToRetrievePaymentFee(Throwable $exception): self
     {
         return new self(
             'Failed to retrieve payment fee',
@@ -26,7 +26,7 @@ public static function failedToRetrievePaymentFee(Throwable $exception): CouldNo
         );
     }
 
-    public static function failedToCreateOrderPaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee
+    public static function failedToCreateOrderPaymentFee(Throwable $exception): self
     {
         return new self(
             'Failed to create order payment fee',
@@ -35,7 +35,7 @@ public static function failedToCreateOrderPaymentFee(Throwable $exception): Coul
         );
     }
 
-    public static function failedToUpdateOrderTotalWithPaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee
+    public static function failedToUpdateOrderTotalWithPaymentFee(Throwable $exception): self
     {
         return new self(
             'Failed to update order total with payment fee.',
diff --git a/subscription/Exception/CouldNotHandleRecurringOrder.php b/subscription/Exception/CouldNotHandleRecurringOrder.php
index e1dbc95e1..88c00de19 100644
--- a/subscription/Exception/CouldNotHandleRecurringOrder.php
+++ b/subscription/Exception/CouldNotHandleRecurringOrder.php
@@ -4,7 +4,7 @@
 
 class CouldNotHandleRecurringOrder extends MollieSubscriptionException
 {
-    public static function failedToFindSelectedCarrier(): CouldNotHandleRecurringOrder
+    public static function failedToFindSelectedCarrier(): self
     {
         return new self(
             'Failed to find selected carrier',
@@ -12,7 +12,7 @@ public static function failedToFindSelectedCarrier(): CouldNotHandleRecurringOrd
         );
     }
 
-    public static function failedToApplySelectedCarrier(): CouldNotHandleRecurringOrder
+    public static function failedToApplySelectedCarrier(): self
     {
         return new self(
             'Failed to apply selected carrier',
diff --git a/subscription/Exception/CouldNotPresentOrderDetail.php b/subscription/Exception/CouldNotPresentOrderDetail.php
index 2b07862b9..8ed1c4c34 100644
--- a/subscription/Exception/CouldNotPresentOrderDetail.php
+++ b/subscription/Exception/CouldNotPresentOrderDetail.php
@@ -4,7 +4,7 @@
 
 class CouldNotPresentOrderDetail extends MollieSubscriptionException
 {
-    public static function failedToFindOrder(): CouldNotPresentOrderDetail
+    public static function failedToFindOrder(): self
     {
         return new self(
             'Failed to find order',
@@ -12,7 +12,7 @@ public static function failedToFindOrder(): CouldNotPresentOrderDetail
         );
     }
 
-    public static function failedToFindOrderDetail(): CouldNotPresentOrderDetail
+    public static function failedToFindOrderDetail(): self
     {
         return new self(
             'Failed to find order detail',
@@ -20,7 +20,7 @@ public static function failedToFindOrderDetail(): CouldNotPresentOrderDetail
         );
     }
 
-    public static function failedToFindProduct(): CouldNotPresentOrderDetail
+    public static function failedToFindProduct(): self
     {
         return new self(
             'Failed to find product',
@@ -28,7 +28,7 @@ public static function failedToFindProduct(): CouldNotPresentOrderDetail
         );
     }
 
-    public static function failedToFindCurrency(): CouldNotPresentOrderDetail
+    public static function failedToFindCurrency(): self
     {
         return new self(
             'Failed to find currency',
diff --git a/subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php b/subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php
index 6c9709b7f..9d2f5fafb 100644
--- a/subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php
+++ b/subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php
@@ -4,7 +4,7 @@
 
 class CouldNotProvideSubscriptionCarrierDeliveryPrice extends MollieSubscriptionException
 {
-    public static function failedToFindSelectedCarrier(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindSelectedCarrier(): self
     {
         return new self(
             'Failed to find selected carrier',
@@ -12,7 +12,7 @@ public static function failedToFindSelectedCarrier(): CouldNotProvideSubscriptio
         );
     }
 
-    public static function failedToFindOrderCart(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindOrderCart(): self
     {
         return new self(
             'Failed to find order cart',
@@ -20,7 +20,7 @@ public static function failedToFindOrderCart(): CouldNotProvideSubscriptionCarri
         );
     }
 
-    public static function failedToFindOrderCustomer(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindOrderCustomer(): self
     {
         return new self(
             'Failed to find order customer',
@@ -28,7 +28,7 @@ public static function failedToFindOrderCustomer(): CouldNotProvideSubscriptionC
         );
     }
 
-    public static function failedToApplySelectedCarrier(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToApplySelectedCarrier(): self
     {
         return new self(
             'Failed to apply selected carrier',
@@ -36,7 +36,7 @@ public static function failedToApplySelectedCarrier(): CouldNotProvideSubscripti
         );
     }
 
-    public static function failedToFindOrderDeliveryAddress(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindOrderDeliveryAddress(): self
     {
         return new self(
             'Failed to find order delivery address',
@@ -44,7 +44,7 @@ public static function failedToFindOrderDeliveryAddress(): CouldNotProvideSubscr
         );
     }
 
-    public static function failedToFindOrderDeliveryCountry(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToFindOrderDeliveryCountry(): self
     {
         return new self(
             'Failed to find order delivery country',
@@ -52,7 +52,7 @@ public static function failedToFindOrderDeliveryCountry(): CouldNotProvideSubscr
         );
     }
 
-    public static function failedToGetSelectedCarrierPrice(): CouldNotProvideSubscriptionCarrierDeliveryPrice
+    public static function failedToGetSelectedCarrierPrice(): self
     {
         return new self(
             'Failed to get selected carrier price',
diff --git a/subscription/Handler/RecurringOrderHandler.php b/subscription/Handler/RecurringOrderHandler.php
index 60d919792..c7cfb4b0e 100644
--- a/subscription/Handler/RecurringOrderHandler.php
+++ b/subscription/Handler/RecurringOrderHandler.php
@@ -203,9 +203,9 @@ private function createSubscription(Payment $transaction, MolRecurringOrder $rec
 
         $newCart->update();
 
-        if (sprintf('%d,', (int) $carrier->id) !==
-            $newCart->getDeliveryOption(null, false, false)[$newCart->id_address_delivery]
-        ) {
+        $cartCarrier = (int) ($newCart->getDeliveryOption(null, false, false)[$newCart->id_address_delivery] ?? 0);
+
+        if ((int) $carrier->id !== $cartCarrier) {
             throw CouldNotHandleRecurringOrder::failedToApplySelectedCarrier();
         }
 
diff --git a/views/templates/admin/Subscription/subscriptions-faq.html.twig b/views/templates/admin/Subscription/subscriptions-faq.html.twig
index 07bcc9659..45db6380e 100644
--- a/views/templates/admin/Subscription/subscriptions-faq.html.twig
+++ b/views/templates/admin/Subscription/subscriptions-faq.html.twig
@@ -32,11 +32,11 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ subscriptionCreationTittle }}
+          <i class="material-icons">info_outline</i> {{ subscriptionCreationTittle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{subscriptionCreation}}</p>
+            <p>{{ subscriptionCreation|escape }}</p>
           </div>
         </div>
       </div>
@@ -47,11 +47,11 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ importantInformationTittle }}
+          <i class="material-icons">info_outline</i> {{ importantInformationTittle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{importantInformation}}</p>
+            <p>{{ importantInformation|escape }}</p>
           </div>
         </div>
       </div>
@@ -62,14 +62,14 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ carrierInformationTitle }}
+          <i class="material-icons">info_outline</i> {{ carrierInformationTitle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{carrierInformation1}}</p>
-            <p>{{carrierInformation2}}</p>
-            <p>{{carrierInformation3}}</p>
-            <p>{{carrierInformation4}}</p>
+            <p>{{ carrierInformation1|escape }}</p>
+            <p>{{ carrierInformation2|escape }}</p>
+            <p>{{ carrierInformation3|escape }}</p>
+            <p>{{ carrierInformation4|escape }}</p>
           </div>
         </div>
       </div>
@@ -80,12 +80,12 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ cartRuleTitle }}
+          <i class="material-icons">info_outline</i> {{ cartRuleTitle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{cartRule}}</p>
-            <p>{{cartRule2}}</p>
+            <p>{{ cartRule|escape }}</p>
+            <p>{{ cartRule2|escape }}</p>
           </div>
         </div>
       </div>
@@ -96,11 +96,11 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ giftWrappingTitle }}
+          <i class="material-icons">info_outline</i> {{ giftWrappingTitle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{giftWrapping1}}</p>
+            <p>{{ giftWrapping1|escape }}</p>
           </div>
         </div>
       </div>
@@ -111,13 +111,13 @@
     <div class="col-lg-12">
       <div class="card">
         <h3 class="card-header">
-          <i class="material-icons">info_outline</i> {{ subscriptionOrderLogicTitle }}
+          <i class="material-icons">info_outline</i> {{ subscriptionOrderLogicTitle|escape }}
         </h3>
         <div class="card-block">
           <div class="card-text">
-            <p>{{recurringOrderCreation}}</p>
-            <p>{{recurringOrderPrice}}</p>
-            <p>{{recurringOrderAPIChanges}}</p>
+            <p>{{ recurringOrderCreation|escape }}</p>
+            <p>{{ recurringOrderPrice|escape }}</p>
+            <p>{{ recurringOrderAPIChanges|escape }}</p>
           </div>
         </div>
       </div>
diff --git a/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl b/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl
index 1d071ee68..73a902eb7 100644
--- a/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl
+++ b/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl
@@ -4,27 +4,27 @@
       <div class="row product-info">
         <div class="col-12 col-lg-6 product-img">
           <img class="img"
-               src="{$order.img}"
+               src="{$order.img|escape:'htmlall':'UTF-8'}"
                itemprop="image" width="200">
         </div>
         <div class="col-12 col-lg-6">
-          <a href="{$order.link}"><p><b>{l s='Product:' mod='mollie'}</b> {$order.name}</p></a>
-          <p><b>{l s='Quantity:' mod='mollie'}</b> {$order.quantity}</p>
-          <p><b>{l s='Unit price:' mod='mollie'}</b> {$order.unit_price}</p>
+          <a href="{$order.link|escape:'htmlall':'UTF-8'}"><p><b>{l s='Product:' mod='mollie'}</b> {$order.name|escape:'htmlall':'UTF-8'}</p></a>
+          <p><b>{l s='Quantity:' mod='mollie'}</b> {$order.quantity|escape:'htmlall':'UTF-8'}</p>
+          <p><b>{l s='Unit price:' mod='mollie'}</b> {$order.unit_price|escape:'htmlall':'UTF-8'}</p>
         </div>
       </div>
     </div>
     <div class="col-12 col-lg-6">
-      <p><b>{l s='Total:' mod='mollie'}</b> {$order.total}</p>
-      <p><b>{l s='Subscription status:' mod='mollie'}</b> {$order.status}</p>
-      <p><b>{l s='Subscription start date:' mod='mollie'}</b> {$order.start_date}</p>
+      <p><b>{l s='Total:' mod='mollie'}</b> {$order.total|escape:'htmlall':'UTF-8'}</p>
+      <p><b>{l s='Subscription status:' mod='mollie'}</b> {$order.status|escape:'htmlall':'UTF-8'}</p>
+      <p><b>{l s='Subscription start date:' mod='mollie'}</b> {$order.start_date|escape:'htmlall':'UTF-8'}</p>
 
       {if isset($order.next_payment_date)}
-        <p><b>{l s='Next payment date:' mod='mollie'}</b> {$order.next_payment_date}</p>
+        <p><b>{l s='Next payment date:' mod='mollie'}</b> {$order.next_payment_date|escape:'htmlall':'UTF-8'}</p>
       {/if}
 
       {if isset($order.cancelled_date)}
-        <p><b>{l s='Cancelled date:' mod='mollie'}</b> {$order.cancelled_date}</p>
+        <p><b>{l s='Cancelled date:' mod='mollie'}</b> {$order.cancelled_date|escape:'htmlall':'UTF-8'}</p>
       {/if}
     </div>
   </div>