Sync bugfix work in progress.