Fixed sync issues