Thread safety updates