Sync errors fixed