Fixed some sync errors