diff --git a/VERSION.txt b/VERSION.txt
index 794e21dd8eba..6f3a0b275720 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.7.37
\ No newline at end of file
+5.7.38
\ No newline at end of file
diff --git a/app/Http/Requests/Preview/PreviewInvoiceRequest.php b/app/Http/Requests/Preview/PreviewInvoiceRequest.php
index 7bbdaebdbe29..5f094ebd4c9c 100644
--- a/app/Http/Requests/Preview/PreviewInvoiceRequest.php
+++ b/app/Http/Requests/Preview/PreviewInvoiceRequest.php
@@ -180,7 +180,7 @@ class PreviewInvoiceRequest extends Request
                 $this->entity_plural = 'credits';
                 return $this;
             case 'recurring_invoice':
-                $this->entity_plural = 'invoices';
+                $this->entity_plural = 'recurring_invoices';
                 return $this;
             default:
                 $this->entity_plural = 'invoices';
diff --git a/app/Services/Invoice/EInvoice/FacturaEInvoice.php b/app/Services/Invoice/EInvoice/FacturaEInvoice.php
index 24371ad2a2f5..935d3ab638d0 100644
--- a/app/Services/Invoice/EInvoice/FacturaEInvoice.php
+++ b/app/Services/Invoice/EInvoice/FacturaEInvoice.php
@@ -527,8 +527,8 @@ class FacturaEInvoice extends AbstractService
             "website" => substr($company->settings->website, 0, 50),
             // "contactPeople" => substr($company->owner()->present()->name(), 0, 40),
             "name" => $company->owner()->present()->firstName(),
-            // "firstSurname" => $company->owner()->present()->firstName(),
-            "lastSurname" => $company->owner()->present()->lastName(),
+            "firstSurname" => $company->owner()->present()->lastName(),
+            // "lastSurname" => $company->owner()->present()->lastName(),
         ]);
 
         $this->fac->setSeller($seller);
diff --git a/app/Services/Pdf/PdfBuilder.php b/app/Services/Pdf/PdfBuilder.php
index c83e0fed78c4..d5ddbe1c7421 100644
--- a/app/Services/Pdf/PdfBuilder.php
+++ b/app/Services/Pdf/PdfBuilder.php
@@ -1046,6 +1046,8 @@ class PdfBuilder
 
         $variables = $this->service->config->pdf_variables['total_columns'];
 
+        nlog($variables);
+
         $elements = [
             ['element' => 'div', 'properties' => ['style' => 'display: flex; flex-direction: column;'], 'elements' => [
                 ['element' => 'p', 'content' => strtr(str_replace(["labels", "values"], ["",""], $_variables['values']['$entity.public_notes']), $_variables), 'properties' => ['data-ref' => 'total_table-public_notes', 'style' => 'text-align: left;']],
@@ -1102,7 +1104,7 @@ class PdfBuilder
 
         foreach ($variables as $variable) {
             if ($variable == '$total_taxes') {
-                $taxes = $this->service->config->entity->total_tax_map;
+                $taxes = $this->service->config->entity->calc()->getTotalTaxMap();
 
                 if (!$taxes) {
                     continue;
@@ -1115,7 +1117,7 @@ class PdfBuilder
                     ]];
                 }
             } elseif ($variable == '$line_taxes') {
-                $taxes = $this->service->config->entity->tax_map;
+                $taxes = $this->service->config->entity->calc()->getTaxMap();
 
                 if (!$taxes) {
                     continue;
diff --git a/app/Services/Template/TemplateAction.php b/app/Services/Template/TemplateAction.php
index 2c753a754d1c..baec76e170c9 100644
--- a/app/Services/Template/TemplateAction.php
+++ b/app/Services/Template/TemplateAction.php
@@ -85,7 +85,7 @@ class TemplateAction implements ShouldQueue
 
         $template = Design::withTrashed()->find($this->decodePrimaryKey($this->template));
 
-        $template_service = new TemplateService($template);
+        $template_service = new \App\Services\Template\TemplateService($template);
         
         match($this->entity) {
             Invoice::class => $resource->with('payments', 'client'),
diff --git a/config/ninja.php b/config/ninja.php
index 6d1c3534d3d3..8f153dc66225 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -15,8 +15,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.37'),
-    'app_tag' => env('APP_TAG','5.7.37'),
+    'app_version' => env('APP_VERSION','5.7.38'),
+    'app_tag' => env('APP_TAG','5.7.38'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),