diff --git a/features/content-moderation/backend-api/nest-cli.json b/features/content-moderation/backend-api/nest-cli.json
index c9ff8240e..f9aa683b1 100644
--- a/features/content-moderation/backend-api/nest-cli.json
+++ b/features/content-moderation/backend-api/nest-cli.json
@@ -3,7 +3,6 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "deleteOutDir": true,
-    "builder": "swc"
+    "deleteOutDir": true
   }
 }
diff --git a/features/platform-admin/backend-api/src/content-hub/services/blog-client.service.ts b/features/platform-admin/backend-api/src/content-hub/services/blog-client.service.ts
index df2cfeaff..460216a37 100644
--- a/features/platform-admin/backend-api/src/content-hub/services/blog-client.service.ts
+++ b/features/platform-admin/backend-api/src/content-hub/services/blog-client.service.ts
@@ -10,7 +10,7 @@ import {
 import { ConfigService } from '@nestjs/config';
 import { catchError, firstValueFrom, timeout } from 'rxjs';
 
-import type { BlogPost } from '@/types';
+import type { BlogPost } from '@/content-hub/types';
 
 const registry = buildDeploymentRegistry({
   deploymentsPath: 'deployments/@domains',
diff --git a/features/platform-admin/backend-api/src/content-hub/services/cms-client.service.ts b/features/platform-admin/backend-api/src/content-hub/services/cms-client.service.ts
index 485566f45..4cf66081c 100644
--- a/features/platform-admin/backend-api/src/content-hub/services/cms-client.service.ts
+++ b/features/platform-admin/backend-api/src/content-hub/services/cms-client.service.ts
@@ -10,7 +10,7 @@ import {
 import { ConfigService } from '@nestjs/config';
 import { catchError, firstValueFrom, timeout } from 'rxjs';
 
-import type { CmsDraft } from '@/types';
+import type { CmsDraft } from '@/content-hub/types';
 
 const registry = buildDeploymentRegistry({
   deploymentsPath: 'deployments/@domains',
diff --git a/features/platform-admin/backend-api/src/content-hub/services/content-aggregator.service.ts b/features/platform-admin/backend-api/src/content-hub/services/content-aggregator.service.ts
index 04701061a..a787d2b65 100644
--- a/features/platform-admin/backend-api/src/content-hub/services/content-aggregator.service.ts
+++ b/features/platform-admin/backend-api/src/content-hub/services/content-aggregator.service.ts
@@ -6,7 +6,7 @@ import { TranslationVerifierService } from './translation-verifier.service';
 
 import type { BlogListFilters } from './blog-client.service';
 import type { CmsListFilters } from './cms-client.service';
-import type { QueryContentDto } from '@/dto/query-content.dto';
+import type { QueryContentDto } from '@/content-hub/dto/query-content.dto';
 import type {
   BlogPost,
   CmsDraft,
@@ -16,7 +16,7 @@ import type {
   DomainContentCount,
   UnifiedContentItem,
   VerificationReport,
-} from '@/types';
+} from '@/content-hub/types';
 
 function mapCmsDraft(draft: CmsDraft): UnifiedContentItem {
   return {
diff --git a/features/platform-admin/backend-api/src/content-hub/services/translation-verifier.service.ts b/features/platform-admin/backend-api/src/content-hub/services/translation-verifier.service.ts
index 5e53abe53..aba8f108f 100644
--- a/features/platform-admin/backend-api/src/content-hub/services/translation-verifier.service.ts
+++ b/features/platform-admin/backend-api/src/content-hub/services/translation-verifier.service.ts
@@ -4,7 +4,7 @@ import { BadRequestException, Injectable, Logger, OnModuleInit } from '@nestjs/c
 import { ConfigService } from '@nestjs/config';
 import { catchError, firstValueFrom, timeout } from 'rxjs';
 
-import type { TranslationVerification, VerificationReport } from '@/types';
+import type { TranslationVerification, VerificationReport } from '@/content-hub/types';
 
 const registry = buildDeploymentRegistry({
   deploymentsPath: 'deployments/@domains',
diff --git a/features/status-dashboard/backend-api/src/auth/flexible-auth.guard.ts b/features/status-dashboard/backend-api/src/auth/flexible-auth.guard.ts
index c319cb78c..14d679322 100755
--- a/features/status-dashboard/backend-api/src/auth/flexible-auth.guard.ts
+++ b/features/status-dashboard/backend-api/src/auth/flexible-auth.guard.ts
@@ -289,7 +289,7 @@ export class FlexibleAuthGuard implements CanActivate {
     }
 
     // Extract host ID from certificate CN (Common Name)
-    const hostId = cert.subject.CN;
+    const hostId = Array.isArray(cert.subject.CN) ? cert.subject.CN[0] : cert.subject.CN;
 
     if (!hostId) {
       this.logger.warn('Certificate missing CN (Common Name)');
diff --git a/features/status-dashboard/backend-api/src/auth/mtls.guard.ts b/features/status-dashboard/backend-api/src/auth/mtls.guard.ts
index 5e03f551c..599f12cf9 100755
--- a/features/status-dashboard/backend-api/src/auth/mtls.guard.ts
+++ b/features/status-dashboard/backend-api/src/auth/mtls.guard.ts
@@ -120,7 +120,7 @@ export class MtlsGuard implements CanActivate {
     }
 
     // Extract host ID from certificate CN (Common Name)
-    const hostId = cert.subject.CN;
+    const hostId = Array.isArray(cert.subject.CN) ? cert.subject.CN[0] : cert.subject.CN;
 
     if (!hostId) {
       this.logger.warn('Certificate missing CN (Common Name)');