Additional concurrency-related fixes.