Cohort fixes