Improving the resiliency of sync