Fix all sync errors