Broken multithreading changes