Fixed a few sync troubles