Fixed sync stuff