diff --git a/frontend/src/components/DataValidationDashboard.tsx b/frontend/src/components/DataValidationDashboard.tsx
index 8cb1fa8..5ddb29f 100644
--- a/frontend/src/components/DataValidationDashboard.tsx
+++ b/frontend/src/components/DataValidationDashboard.tsx
@@ -146,10 +146,10 @@ export default function DataValidationDashboard() {
 
   // Group typeComparisons by schema
   const groupedBySchema = (() => {
-    if (!stats) return new Map<string, typeof stats.comparison.typeComparisons>();
+    if (!stats) return new Map<string, DataValidationStats['comparison']['typeComparisons']>();
     
-    const grouped = new Map<string, typeof stats.comparison.typeComparisons>();
-    const noSchemaGroup: typeof stats.comparison.typeComparisons = [];
+    const grouped = new Map<string, DataValidationStats['comparison']['typeComparisons']>();
+    const noSchemaGroup: DataValidationStats['comparison']['typeComparisons'] = [];
     
     for (const comp of stats!.comparison.typeComparisons) {
       const schemaKey = comp.schemaId && comp.schemaName 
diff --git a/frontend/src/components/ObjectDetailModal.tsx b/frontend/src/components/ObjectDetailModal.tsx
index 6a7201a..6763bb8 100644
--- a/frontend/src/components/ObjectDetailModal.tsx
+++ b/frontend/src/components/ObjectDetailModal.tsx
@@ -300,26 +300,32 @@ export default function ObjectDetailModal({ objectId, onClose, onObjectClick, on
                         const obj = objectData.object as Record<string, unknown>;
                         const updatedAt = obj._jiraUpdatedAt;
                         const createdAt = obj._jiraCreatedAt;
-                        const hasUpdatedAt = updatedAt && (typeof updatedAt === 'string' || typeof updatedAt === 'number' || updatedAt instanceof Date);
-                        const hasCreatedAt = createdAt && (typeof createdAt === 'string' || typeof createdAt === 'number' || createdAt instanceof Date);
+                        const updatedAtValue: string | number | Date | null = 
+                          updatedAt && (typeof updatedAt === 'string' || typeof updatedAt === 'number' || updatedAt instanceof Date)
+                            ? (updatedAt as string | number | Date)
+                            : null;
+                        const createdAtValue: string | number | Date | null = 
+                          createdAt && (typeof createdAt === 'string' || typeof createdAt === 'number' || createdAt instanceof Date)
+                            ? (createdAt as string | number | Date)
+                            : null;
                         
-                        if (!hasUpdatedAt && !hasCreatedAt) return null;
+                        if (!updatedAtValue && !createdAtValue) return null;
                         
                         return (
                           <div className="grid grid-cols-2 gap-6">
-                            {hasUpdatedAt && (
+                            {updatedAtValue && (
                               <div>
                                 <div className="text-xs font-semibold text-gray-500 uppercase tracking-wider mb-2">Laatst bijgewerkt (Jira)</div>
                                 <div className="text-sm font-medium text-gray-900 bg-gray-50 px-3 py-2 rounded-lg border border-gray-200">
-                                  {new Date(updatedAt as string | number | Date).toLocaleString('nl-NL')}
+                                  {new Date(updatedAtValue).toLocaleString('nl-NL')}
                                 </div>
                               </div>
                             )}
-                            {hasCreatedAt && (
+                            {createdAtValue && (
                               <div>
                                 <div className="text-xs font-semibold text-gray-500 uppercase tracking-wider mb-2">Aangemaakt (Jira)</div>
                                 <div className="text-sm font-medium text-gray-900 bg-gray-50 px-3 py-2 rounded-lg border border-gray-200">
-                                  {new Date(createdAt as string | number | Date).toLocaleString('nl-NL')}
+                                  {new Date(createdAtValue).toLocaleString('nl-NL')}
                                 </div>
                               </div>
                             )}