Fixed remaining worker concurrency issues