Syncing bugs fixed