some-sync-fixes