Further improve sync.