More stable local syncing