More multi-threading optimizations...