Quick concurrency fixes

More multithreading