Fixing up some concurrency.