Fix sync errors