Snip out a couple other potential race conditions with the indexer
Snip out a couple other potential race conditions with the indexer

rajthilakmca/goiardi,theckman/goiardi,QuinnEbert/goiardi,QuinnEbert/goiardi,ctdk/goiardi,ctdk/goiardi,theckman/goiardi,rajthilakmca/goiardi