Fixes to sync handling, trying to prevent "sync-list flooding"