Fixed sync & other issues