Fix syncing and update tracking