diff --git a/src/MEDS_DEV/tasks/criteria/disease_progression/diabetes/ckd_post_kidney_labs.yaml b/src/MEDS_DEV/tasks/criteria/disease_progression/diabetes/ckd_post_kidney_labs.yaml
index 4806f49..750d9a8 100644
--- a/src/MEDS_DEV/tasks/criteria/disease_progression/diabetes/ckd_post_kidney_labs.yaml
+++ b/src/MEDS_DEV/tasks/criteria/disease_progression/diabetes/ckd_post_kidney_labs.yaml
@@ -72,7 +72,7 @@ windows:
     index_timestamp: end
   target:
     start: input.end
-    end: start + 5y
+    end: start + 1825D # 5 years
     start_inclusive: False
     end_inclusive: True
     label: ckd_dx
diff --git a/src/MEDS_DEV/tasks/criteria/phenotyping/outpatient/MI/1y-5y.yaml b/src/MEDS_DEV/tasks/criteria/phenotyping/outpatient/MI/1y-5y.yaml
index 371a962..bacab41 100644
--- a/src/MEDS_DEV/tasks/criteria/phenotyping/outpatient/MI/1y-5y.yaml
+++ b/src/MEDS_DEV/tasks/criteria/phenotyping/outpatient/MI/1y-5y.yaml
@@ -22,14 +22,14 @@ windows:
     index_timestamp: end
   gap:
     start: trigger
-    end: trigger + 1y
+    end: start + 365D
     start_inclusive: True
     end_inclusive: True
     has:
       MI: (None, 0)
   target:
-    start: trigger + 1y
-    end: trigger + 5y
+    start: trigger + 365D
+    end: start + 1825D # 5 years
     start_inclusive: False
     end_inclusive: True
     label: MI