diff --git a/src/RoadRegistry.BackOffice/FeatureCompare/Translators/GradeSeparatedJunctionFeatureCompareTranslator.cs b/src/RoadRegistry.BackOffice/FeatureCompare/Translators/GradeSeparatedJunctionFeatureCompareTranslator.cs
index 32282da2a..0c9847a30 100644
--- a/src/RoadRegistry.BackOffice/FeatureCompare/Translators/GradeSeparatedJunctionFeatureCompareTranslator.cs
+++ b/src/RoadRegistry.BackOffice/FeatureCompare/Translators/GradeSeparatedJunctionFeatureCompareTranslator.cs
@@ -1,16 +1,15 @@
 namespace RoadRegistry.BackOffice.FeatureCompare.Translators;
 
 using Extracts;
+using Extracts.Dbase.GradeSeparatedJuntions;
 using FeatureToggles;
 using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO.Compression;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Extracts.Dbase.GradeSeparatedJuntions;
 using Uploads;
 
 public class GradeSeparatedJunctionFeatureCompareTranslator : FeatureCompareTranslatorBase<GradeSeparatedJunctionFeatureCompareAttributes>
diff --git a/src/RoadRegistry.BackOffice/FeatureCompare/Translators/RoadSegmentFeatureCompareTranslator.cs b/src/RoadRegistry.BackOffice/FeatureCompare/Translators/RoadSegmentFeatureCompareTranslator.cs
index 11b51c24c..8f4702bab 100644
--- a/src/RoadRegistry.BackOffice/FeatureCompare/Translators/RoadSegmentFeatureCompareTranslator.cs
+++ b/src/RoadRegistry.BackOffice/FeatureCompare/Translators/RoadSegmentFeatureCompareTranslator.cs
@@ -80,7 +80,9 @@ RoadNodeFeatureCompareRecord FindRoadNodeByOriginalId(RoadNodeId originalId)
 
                 if (startNodeFeature is null || endNodeFeature is null)
                 {
-                    var recordContext = FileName.AtDbaseRecord(FeatureType.Change, changeFeature.RecordNumber);
+                    var recordContext = FileName
+                        .AtDbaseRecord(FeatureType.Change, changeFeature.RecordNumber)
+                        .WithIdentifier(nameof(RoadSegmentDbaseRecord.WS_OIDN), changeFeature.Attributes.Id);
 
                     if (startNodeFeature is null)
                     {
@@ -236,7 +238,9 @@ RoadNodeFeatureCompareRecord FindRoadNodeByOriginalId(RoadNodeId originalId)
             var maintenanceAuthority = await _organizationRepository.FindByIdOrOvoCodeAsync(changeFeature.Attributes.MaintenanceAuthority, cancellationToken);
             if (maintenanceAuthority is null)
             {
-                var recordContext = FileName.AtDbaseRecord(FeatureType.Change, changeFeature.RecordNumber);
+                var recordContext = FileName
+                    .AtDbaseRecord(FeatureType.Change, changeFeature.RecordNumber)
+                    .WithIdentifier(nameof(RoadSegmentDbaseRecord.WS_OIDN), changeFeature.Attributes.Id);
 
                 problems += recordContext.RoadSegmentMaintenanceAuthorityNotKnown(changeFeature.Attributes.MaintenanceAuthority);
                 continue;