fix restart-index-builds-after-shutdown issues