Further improvements to sync.