[Sync] Minor sync work