Bug fixes related to optimization in first cohort