Fix more sync errors