Multithreaded fixes -- Remove more statics.