More multithreaded-fixes.