Sync recovery improvements