Fixed sync errors