HSEARCH-1377 Polish some minor concurrency mistakes