Changes to fix sync issues with the experiments.