[Sync] Small updates from One