diff --git a/sources/Framework/org.ohdsi.cdm.framework.common3/Core/Transformation/OptumPanther/OptumOncologyPersonBuilder.cs b/sources/Framework/org.ohdsi.cdm.framework.common3/Core/Transformation/OptumPanther/OptumOncologyPersonBuilder.cs
index 943cf814..6c0bc072 100644
--- a/sources/Framework/org.ohdsi.cdm.framework.common3/Core/Transformation/OptumPanther/OptumOncologyPersonBuilder.cs
+++ b/sources/Framework/org.ohdsi.cdm.framework.common3/Core/Transformation/OptumPanther/OptumOncologyPersonBuilder.cs
@@ -845,6 +845,9 @@ public override Attrition Build(ChunkData data, KeyMasterOffsetManager om)
             {
                 visitOccurrence.Id = Offset.GetKeyOffset(visitOccurrence.PersonId).VisitOccurrenceId;
 
+                if (visitOccurrence.ConceptId == 0)
+                    visitOccurrence.ConceptId = 9202;
+
                 if (!visitOccurrence.EndDate.HasValue)
                     visitOccurrence.EndDate = visitOccurrence.StartDate;
 
@@ -970,6 +973,15 @@ public override Attrition Build(ChunkData data, KeyMasterOffsetManager om)
                 return Attrition.InvalidObservationTime;
             }
 
+            // there are a small number of patients who have weird observation_period_end_date between 2025 - 6011.
+            // These should be truncated to the current year.
+            if (observationPeriodsFinal[0].EndDate.Value.Year > DateTime.Now.Year)
+            {
+                observationPeriodsFinal[0].EndDate = new DateTime(DateTime.Now.Year, 
+                    observationPeriodsFinal[0].EndDate.Value.Month,
+                    observationPeriodsFinal[0].EndDate.Value.Day);
+            }
+
             // set corresponding ProviderIds
             SetProviderIds(drugExposures);
             SetProviderIds(conditionOccurrences);