Multiple thread robustness improvements