even more sync-fixes