More changes to fix or try to fix the darned concurrency