Adapt to thread safety changes