Fixing sync errors